From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 14 Sep 2015 21:59:07 +0000 (-0700)
Subject: Merge branch 'js/maint-am-skip-performance-regression'
X-Git-Tag: v2.6.0-rc3~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf2094ca6349fe8cfe0f327e36ea386ad8ac98db;p=thirdparty%2Fgit.git

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
---

cf2094ca6349fe8cfe0f327e36ea386ad8ac98db