author | Junio C Hamano <gitster@pobox.com> | |
Tue, 21 Dec 2010 18:35:53 +0000 (10:35 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 21 Dec 2010 19:16:28 +0000 (11:16 -0800) | ||
commit | 7b3b7e37581fb5266a260687c21af1571b4ade81 | |
tree | 62f8028ae58d7b6d6d6b372b9cd0b1e692fb6e44 | tree | snapshot |
parent | 05bb5a2584ca0e1c87a2135a83c5573b9337d06f | commit | diff |
am --abort: keep unrelated commits since the last failure and warn
After making commits (either by pulling or doing their own work) after a
failed "am", the user will be reminded by next "am" invocation that there
was a failed "am" that the user needs to decide to resolve or to get rid
of the old "am" attempt. The "am --abort" option was meant to help the
latter. However, it rewinded the HEAD back to the beginning of the failed
"am" attempt, discarding commits made (perhaps by mistake) since.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
After making commits (either by pulling or doing their own work) after a
failed "am", the user will be reminded by next "am" invocation that there
was a failed "am" that the user needs to decide to resolve or to get rid
of the old "am" attempt. The "am --abort" option was meant to help the
latter. However, it rewinded the HEAD back to the beginning of the failed
"am" attempt, discarding commits made (perhaps by mistake) since.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-am.sh | diff | blob | history | |
t/t4151-am-abort.sh | diff | blob | history |