| commit | b7d2a15b9f5cdbed7e8dbcc3fff0ea1ae92ed764 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Aug 2015 22:45:32 +0000 (26 15:45 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Aug 2015 22:45:32 +0000 (26 15:45 -0700) | ||
| tree | af0c7b8de03f8144f2b020e3bd273cb3cb88893a | treesnapshot (tar.gz zip) |
| parent | 788f2119666f644eb8477ea04253f6abfb3a35a4 | commitdiff |
| parent | 3ecc7040eff29fea0051df9faf21b0a73ee6d911 | commitdiff |
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
"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 | blobhistory |