| commit | 2d56a136435bd40f9b6b75103eb4d75003154c9f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 26 Feb 2009 19:24:29 +0000 (26 11:24 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 27 Feb 2009 07:06:38 +0000 (26 23:06 -0800) | ||
| tree | 51f563269ab7b25b03ad1838eb2081404a315591 | treesnapshot (tar.gz zip) |
| parent | c767184d8f99404d456b32a2c6c5c41d6db7a847 | commitdiff |
git-am: make --abort less dangerous
When you are in the middle of "git rebase", "git am --abort" by mistake
would have referred to nonexistent ORIG_HEAD and barfed, or worse yet, used
a stale ORIG_HEAD and taken you to an unexpected commit.
Also the option parsing did not reject "git am --abort --skip".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When you are in the middle of "git rebase", "git am --abort" by mistake
would have referred to nonexistent ORIG_HEAD and barfed, or worse yet, used
a stale ORIG_HEAD and taken you to an unexpected commit.
Also the option parsing did not reject "git am --abort --skip".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-am.sh | diffblobblamehistory |