diff options
| author |  Paul Tan <pyokagan@gmail.com> | 2015-06-06 19:46:11 +0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-06-08 13:10:45 -0700 |
| commit | e06764c8ebf87a80737dc0a6198a013799f18e32 (patch) | |
| tree | 88a26db295be4d1b2d97fabb50105ad046aa67a2 /git-gui | |
| parent | am --abort: revert changes introduced by failed 3way merge (diff) | |
| download | tgif-e06764c8ebf87a80737dc0a6198a013799f18e32.tar.xz | |
am --abort: support aborting to unborn branch
When git-am is first run on an unborn branch, no ORIG_HEAD is created.
As such, any applied commits will remain even after a git am --abort.
To be consistent with the behavior of git am --abort when it is not run
from an unborn branch, we empty the index, and then destroy the branch
pointed to by HEAD if there is no ORIG_HEAD.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui')
0 files changed, 0 insertions, 0 deletions