From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 17 Sep 2015 19:03:02 +0000 (-0700)
Subject: Merge branch 'js/maint-am-skip-performance-regression' into maint
X-Git-Tag: v2.5.3~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=02dad2673b2bea4d28ca1b79c2e40fb8ad170959;p=thirdparty%2Fgit.git

Merge branch 'js/maint-am-skip-performance-regression' into maint

* js/maint-am-skip-performance-regression:
  am --skip/--abort: merge HEAD/ORIG_HEAD tree into index
---

02dad2673b2bea4d28ca1b79c2e40fb8ad170959