Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
applypatch: use "--index" to actually make git-apply write the
[gitweb.git]
/
applypatch
diff --git
a/applypatch
b/applypatch
index 6db358877377ca79187bb44e3c8331d8f65c4716..789917f3c51325e80418cfdeccfa6fb4dcb7d290 100755
(executable)
--- a/
applypatch
+++ b/
applypatch
@@
-58,7
+58,7
@@
echo
echo Applying "'$SUBJECT'"
echo
-git-apply $PATCHFILE || exit 1
+git-apply
--index
$PATCHFILE || exit 1
tree=$(git-write-tree) || exit 1
echo Wrote tree $tree
commit=$(git-commit-tree $tree -p $(cat .git/HEAD) < $final) || exit 1