diff options
| author | Mike Hommey <mh@glandium.org> | 2008-03-01 10:32:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-12 02:30:33 (GMT) |
| commit | 4201bb5f7e408143dc5bf35497cc82bc803fe9fb (patch) | |
| tree | 1ffdcfe10713902a4490e02b12124a7f62a0d71f /xdiff-interface.c | |
| parent | 92aeb994d3195d3601df2e37052d60f9a6738b61 (diff) | |
| download | git-4201bb5f7e408143dc5bf35497cc82bc803fe9fb.zip git-4201bb5f7e408143dc5bf35497cc82bc803fe9fb.tar.gz git-4201bb5f7e408143dc5bf35497cc82bc803fe9fb.tar.bz2 | |
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.
[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>
Diffstat (limited to 'xdiff-interface.c')
0 files changed, 0 insertions, 0 deletions