| commit | cf2094ca6349fe8cfe0f327e36ea386ad8ac98db | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 14 Sep 2015 21:59:07 +0000 (14 14:59 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 14 Sep 2015 21:59:13 +0000 (14 14:59 -0700) | ||
| tree | ebb512ac6e35945124a5afe7f6004d5172feeedc | treesnapshot (tar.gz zip) |
| parent | b8367d1f012ceb86ab48c9024a1bac111bb52dde | commitdiff |
| parent | b9d66899a992525f2de9436e160779844ecfa2f1 | commitdiff |
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
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
| contrib/examples/git-am.sh | diff1 | diff2 | blobhistory |