Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
[PATCH 2/4] split core-git.txt and update
[gitweb.git]
/
git-apply-patch-script
diff --git
a/git-apply-patch-script
b/git-apply-patch-script
index 13ec1c4490612f524f9b1070a57229cdc2c50aed..0849a3e68b3a219aa41e3357fd71fb39b285e059 100755
(executable)
--- a/
git-apply-patch-script
+++ b/
git-apply-patch-script
@@
-8,7
+8,7
@@
#
case "$#" in
-
2
)
+
1
)
echo >&2 "cannot handle unmerged diff on path $1."
exit 1 ;;
esac