diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-09-14 14:59:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-14 14:59:13 -0700 |
| commit | cf2094ca6349fe8cfe0f327e36ea386ad8ac98db (patch) | |
| tree | ebb512ac6e35945124a5afe7f6004d5172feeedc /contrib/examples | |
| parent | b8367d1f012ceb86ab48c9024a1bac111bb52dde (diff) | |
| parent | b9d66899a992525f2de9436e160779844ecfa2f1 (diff) | |
| download | git-cf2094ca6349fe8cfe0f327e36ea386ad8ac98db.tar.gz | |
Merge branch 'js/maint-am-skip-performance-regression'
Recent versions of scripted "git am" has a performance regression in
"git am --skip" codepath, which no longer exists in the built-in
version on the 'master' front. Fix the regression in the last
scripted version that appear in 2.5.x maintenance track and older.
* js/maint-am-skip-performance-regression:
am --skip/--abort: merge HEAD/ORIG_HEAD tree into index
Diffstat (limited to 'contrib/examples')
| -rwxr-xr-x | contrib/examples/git-am.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/examples/git-am.sh b/contrib/examples/git-am.sh index 3b77028123..dd539f1a8a 100755 --- a/contrib/examples/git-am.sh +++ b/contrib/examples/git-am.sh @@ -512,7 +512,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" |