Merge branch 'js/maint-am-skip-performance-regression' into maint

* js/maint-am-skip-performance-regression:
am --skip/--abort: merge HEAD/ORIG_HEAD tree into index

diff --git a/git-am.sh b/git-am.sh
index 3af351ffaaf32af6431e7a0dd53ea619507c55bf..455ce4fca0c2fff43f097673a023931b04485d2e 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -510,7 +510,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"