git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 788f211 3ecc704)
Merge branch 'pt/am-builtin-abort-fix'
authorJunio C Hamano <redacted>
Wed, 26 Aug 2015 22:45:32 +0000 (15:45 -0700)
committerJunio C Hamano <redacted>
Wed, 26 Aug 2015 22:45:32 +0000 (15:45 -0700)
commitb7d2a15b9f5cdbed7e8dbcc3fff0ea1ae92ed764
treeaf0c7b8de03f8144f2b020e3bd273cb3cb88893atree | snapshot
parent788f2119666f644eb8477ea04253f6abfb3a35a4commit | diff
parent3ecc7040eff29fea0051df9faf21b0a73ee6d911commit | diff
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
builtin/am.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT