diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-24 12:21:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-24 12:21:50 -0700 |
| commit | ce5e33832ae3f7224fe39d6ade4764522197bacf (patch) | |
| tree | 0230514d9edadd2eb41f0673e42c9ca54ccd664a /trailer.c | |
| parent | 6f59058e490fa72c09faa974addfeeb2868dc648 (diff) | |
| parent | 6ea3b67b4e3f4a09561a26ca42af1492b3b48c95 (diff) | |
| download | git-ce5e33832ae3f7224fe39d6ade4764522197bacf.tar.gz | |
Merge branch 'pt/am-abort-fix'
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 'trailer.c')
0 files changed, 0 insertions, 0 deletions