From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Aug 2015 22:45:32 +0000 (-0700)
Subject: Merge branch 'pt/am-builtin-abort-fix'
X-Git-Tag: v2.6.0-rc0~38
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b7d2a15b9f5cdbed7e8dbcc3fff0ea1ae92ed764;p=git

Merge branch 'pt/am-builtin-abort-fix'

"git am" that was recently reimplemented in C had a performance
regression in "git am --abort" that goes back to the version before
an attempted (and failed) patch application.

* pt/am-builtin-abort-fix:
  am --skip/--abort: merge HEAD/ORIG_HEAD tree into index
---

b7d2a15b9f5cdbed7e8dbcc3fff0ea1ae92ed764