Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
am --skip/--abort: merge HEAD/ORIG_HEAD tree into index
[gitweb.git]
/
git-am.sh
diff --git
a/git-am.sh
b/git-am.sh
index 3103c0fc28910560d85f4c2cff2b6a0595848b16..4ab1f21505121a8f89735cf21b1681be2a57767d 100755
(executable)
--- a/
git-am.sh
+++ b/
git-am.sh
@@
-509,7
+509,7
@@
then
git read-tree --reset -u $head_tree $head_tree &&
index_tree=$(git write-tree) &&
git read-tree -m -u $index_tree $head_tree
- git read-tree $head_tree
+ git read-tree
-m
$head_tree
;;
,t)
if test -f "$dotest/rebasing"