diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-07 07:16:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-07 20:12:56 (GMT) |
| commit | 22e407951ef2572c1e68a39364fd3c4b649a3495 (patch) | |
| tree | 204139801028c6c7e8e17f2ff116a17e9c96c601 /git-rebase--interactive.sh | |
| parent | 44701c67fd1d5d771b440c8646b7b268d4f1402d (diff) | |
| download | git-22e407951ef2572c1e68a39364fd3c4b649a3495.zip git-22e407951ef2572c1e68a39364fd3c4b649a3495.tar.gz git-22e407951ef2572c1e68a39364fd3c4b649a3495.tar.bz2 | |
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>
Diffstat (limited to 'git-rebase--interactive.sh')
| -rwxr-xr-x | git-rebase--interactive.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index a64d9d5..02d7e3c 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -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 |