| commit | 9cac1de38aa34d32e449b84bcd65a363ed0aacd3 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 16 Jun 2015 21:43:28 +0000 (16 14:43 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 16 Jun 2015 21:43:28 +0000 (16 14:43 -0700) | ||
| tree | 7c5cc6ba5d53184a8e6d6fb74890d2bab173f95b | treesnapshot (tar.gz zip) |
| parent | 5e7df1d3c92cda8cfb9bfab43f2433a56bc23a07 | commitdiff |
| parent | 6ea3b67b4e3f4a09561a26ca42af1492b3b48c95 | commitdiff |
Merge branch 'pt/am-abort-fix' into next
Various fixes around "git am" that applies a patch to a history
that is not there yet.
* pt/am-abort-fix:
am --abort: keep unrelated commits on unborn branch
am --abort: support aborting to unborn branch
am --abort: revert changes introduced by failed 3way merge
am --skip: support skipping while on unborn branch
am -3: support 3way merge on unborn branch
am --skip: revert changes introduced by failed 3way merge
Various fixes around "git am" that applies a patch to a history
that is not there yet.
* pt/am-abort-fix:
am --abort: keep unrelated commits on unborn branch
am --abort: support aborting to unborn branch
am --abort: revert changes introduced by failed 3way merge
am --skip: support skipping while on unborn branch
am -3: support 3way merge on unborn branch
am --skip: revert changes introduced by failed 3way merge
| git-am.sh | diff1 | diff2 | blobhistory |
| t/t4151-am-abort.sh | diff1 | diff2 | blobhistory |