]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b8367d1 b9d6689)
Merge branch 'js/maint-am-skip-performance-regression'
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 Sep 2015 21:59:07 +0000 (14:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Sep 2015 21:59:13 +0000 (14:59 -0700)
commitcf2094ca6349fe8cfe0f327e36ea386ad8ac98db
treeebb512ac6e35945124a5afe7f6004d5172feeedctree | snapshot
parentb8367d1f012ceb86ab48c9024a1bac111bb52ddecommit | diff
parentb9d66899a992525f2de9436e160779844ecfa2f1commit | diff
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
contrib/examples/git-am.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.