summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-09-17 12:03:02 -0700
committerJunio C Hamano <gitster@pobox.com>2015-09-17 12:03:02 -0700
commit02dad2673b2bea4d28ca1b79c2e40fb8ad170959 (patch)
treea9c2d25b7d967768e76032ceb81d2ec864fdc278
parent27ea6f85beff1173ec74349fa35c45951feee570 (diff)
parentb9d66899a992525f2de9436e160779844ecfa2f1 (diff)
downloadgit-02dad2673b2bea4d28ca1b79c2e40fb8ad170959.tar.gz
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
-rwxr-xr-xgit-am.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index 3af351ffaa..455ce4fca0 100755
--- 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"