summaryrefslogtreecommitdiff
path: root/t/t3407-rebase-abort.sh
AgeCommit message (Collapse)AuthorFilesLines
2008-03-11git rebase --abort: always restore the right commitLibravatar Mike Hommey1-0/+71
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. [jc: cherry-picked from 48411d and 4947cf9 on 'master'] Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>