]> git.ipfire.org Git - thirdparty/git.git/commit
builtin-am: implement --abort
authorPaul Tan <pyokagan@gmail.com>
Tue, 4 Aug 2015 13:51:35 +0000 (21:51 +0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Aug 2015 05:02:11 +0000 (22:02 -0700)
commit33388a71d23e6a296eb33879e418e857444f2d74
tree9363f691579eb924ad9f8c5952a48e1429d87769
parent9990080c9db0e4cb1dc0f981d85983edbf2a6f68
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>
builtin/am.c