mirror of
https://github.com/git/git
synced 2024-10-30 04:01:21 +00:00
Teach "am" and "rebase" to mark the original position with ORIG_HEAD
"merge" and "reset" leave the original point in history in ORIG_HEAD, which makes it easy to go back to where you were before you inflict a major damage to your history and realize that you do not like the result at all. These days with reflog, we technically do not need to use ORIG_HEAD, but it is a handy way nevertheless. This teaches "am" and "rebase" (all forms --- the vanilla one that uses "am" as its backend, "-m" variant that cherry-picks, and "--interactive") to do the same. The original idea and a partial implementation to do this only for "rebase -m" was by Brian Gernhardt; this extends on his idea. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
44701c67fd
commit
22e407951e
3 changed files with 3 additions and 1 deletions
|
@ -241,6 +241,7 @@ else
|
|||
: >"$dotest/rebasing"
|
||||
else
|
||||
: >"$dotest/applying"
|
||||
git update-ref ORIG_HEAD HEAD
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
|
@ -549,6 +549,7 @@ EOF
|
|||
has_action "$TODO" ||
|
||||
die_abort "Nothing to do"
|
||||
|
||||
git update-ref ORIG_HEAD $HEAD
|
||||
output git checkout $ONTO && do_rest
|
||||
;;
|
||||
esac
|
||||
|
|
|
@ -378,7 +378,7 @@ fi
|
|||
echo "First, rewinding head to replay your work on top of it..."
|
||||
git checkout "$onto^0" >/dev/null 2>&1 ||
|
||||
die "could not detach HEAD"
|
||||
# git reset --hard "$onto^0"
|
||||
git update-ref ORIG_HEAD $branch
|
||||
|
||||
# If the $onto is a proper descendant of the tip of the branch, then
|
||||
# we just fast forwarded.
|
||||
|
|
Loading…
Reference in a new issue