projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
97b865b
)
applypatch: use "--index" to actually make git-apply write the
author
Linus Torvalds
<torvalds@ppc970.osdl.org>
Sun, 5 Jun 2005 21:12:53 +0000
(14:12 -0700)
committer
Linus Torvalds
<torvalds@ppc970.osdl.org>
Sun, 5 Jun 2005 21:12:53 +0000
(14:12 -0700)
changes to the index file.
applypatch
patch
|
blob
|
history
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