From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 Feb 2009 19:24:29 +0000 (-0800)
Subject: git-am: make --abort less dangerous
X-Git-Tag: v1.6.2~17
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2d56a136435bd40f9b6b75103eb4d75003154c9f?hp=2d56a136435bd40f9b6b75103eb4d75003154c9f

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>
---