diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-03 10:41:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-03 10:41:32 -0700 |
| commit | c36e465aca712cea70cb9570a1e7136e5de36b76 (patch) | |
| tree | a80105535c9ea72b73b58574728fdc8cbeecf26a /t/t3702-add-edit.sh | |
| parent | 0533a9b70cc768438a817103f02c51bc4f52bf45 (diff) | |
| parent | 6ea3b67b4e3f4a09561a26ca42af1492b3b48c95 (diff) | |
| download | git-c36e465aca712cea70cb9570a1e7136e5de36b76.tar.gz | |
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
Diffstat (limited to 't/t3702-add-edit.sh')
0 files changed, 0 insertions, 0 deletions