diff options
| author | Paul Tan <pyokagan@gmail.com> | 2015-08-04 13:51:35 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-05 05:02:11 (GMT) |
| commit | 33388a71d23e6a296eb33879e418e857444f2d74 (patch) | |
| tree | 9363f691579eb924ad9f8c5952a48e1429d87769 /diff.c | |
| parent | 9990080c9db0e4cb1dc0f981d85983edbf2a6f68 (diff) | |
| download | git-33388a71d23e6a296eb33879e418e857444f2d74.zip git-33388a71d23e6a296eb33879e418e857444f2d74.tar.gz git-33388a71d23e6a296eb33879e418e857444f2d74.tar.bz2 | |
builtin-am: implement --abort
Since 3e5057a (git am --abort, 2008-07-16), git-am supported the --abort
option that will rewind HEAD back to the original commit. Re-implement
this through am_abort().
Since 7b3b7e3 (am --abort: keep unrelated commits since the last failure
and warn, 2010-12-21), to prevent commits made since the last failure
from being lost, git-am will not rewind HEAD back to the original
commit if HEAD moved since the last failure. Re-implement this through
safe_to_abort().
Helped-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions