Mike Hommey 48411d2233 git rebase --abort: always restore the right commit ...

Previously, --abort would end by git resetting to ORIG_HEAD, but some
commands, such as git reset --hard (which happened in git rebase --skip,
but could just as well be typed by the user), would have already modified
ORIG_HEAD.

Just use the orig-head we store in $dotest instead.

Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2008-03-01 23:52:00 -08:00

10 KiB

Executable File

Raw Blame History

View Raw