]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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

1  2 
contrib/examples/git-am.sh patch | diff1 | diff2 | blob | history

diff --cc contrib/examples/git-am.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.