| commit | c36e465aca712cea70cb9570a1e7136e5de36b76 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 3 Aug 2015 17:41:32 +0000 (3 10:41 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 3 Aug 2015 17:41:32 +0000 (3 10:41 -0700) | ||
| tree | a80105535c9ea72b73b58574728fdc8cbeecf26a | treesnapshot (tar.gz zip) |
| parent | 0533a9b70cc768438a817103f02c51bc4f52bf45 | commitdiff |
| parent | 6ea3b67b4e3f4a09561a26ca42af1492b3b48c95 | commitdiff |
Merge branch 'pt/am-abort-fix' into maint
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 |