diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-14 23:45:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-14 23:45:49 -0700 |
| commit | 633ce9a3ba973acf19a122e1359b7ae724887d70 (patch) | |
| tree | d360db37cc2c4f64ed85eae77e03f2b98061c9b1 /git-rebase.sh | |
| parent | 055767194c15f9b7c39a509daf1a77472c77bed8 (diff) | |
| parent | 9869099bee332e4c351c3aaa15a74786d85909c7 (diff) | |
| download | git-633ce9a3ba973acf19a122e1359b7ae724887d70.tar.gz | |
Merge branch 'jc/rebase-orig-head'
* jc/rebase-orig-head:
Documentation: mention ORIG_HEAD in am, merge, and rebase
Teach "am" and "rebase" to mark the original position with ORIG_HEAD
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index e2d85eeeab..2597d777d6 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -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. |