# [PATCH v2] Make rebase save ORIG_HEAD if changing current branch 2 messages from 2008-07-06 to 2008-07-06. Participants: Brian Gernhardt. Thread: https://gitlist.dev/t/14308 ## Brian Gernhardt, 2008-07-06 08:40 Subject: [PATCH v2] Make rebase save ORIG_HEAD if changing current branch Message-ID: <1215333658-84938-1-git-send-email-benji@silverinsanity.com> URL: https://gitlist.dev/e/1215333658-84938-1-git-send-email-benji%40silverinsanity.com ``` This makes rebase act a little more like merge when working on the current branch. This is particularly useful for `git pull --rebase` Signed-off-by: Brian Gernhardt --- If I followed the discussion the last time I sent this in correctly, the two issues were: - Ugly "echo > ORIG_HEAD" instead of pretty "git update-ref ORIG_HEAD" - Setting ORIG_HEAD at the wrong place Let me know if there are any other issues. git-rebase.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/git-rebase.sh b/git-rebase.sh index e2d85ee..44db7e6 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -434,3 +434,4 @@ do done finish_rb_merge +git update-ref ORIG_HEAD $orig_head -- 1.5.6.1.324.gc55f7 ``` ## Brian Gernhardt, 2008-07-06 16:16 Subject: [PATCH v3] Make rebase save ORIG_HEAD if changing current branch Message-ID: <1215360963-85805-1-git-send-email-benji@silverinsanity.com> URL: https://gitlist.dev/e/1215360963-85805-1-git-send-email-benji%40silverinsanity.com In-Reply-To: <1215333658-84938-1-git-send-email-benji@silverinsanity.com> ``` This makes rebase act a little more like merge when working on the current branch. This is particularly useful for `git pull --rebase` Signed-off-by: Brian Gernhardt --- Okay, I apparently should stop coding after midnight, even if I think I'm awake enough. This version uses the correct variable. $orig_head looks like the right name, but it stores the symbolic ref. $prev_head stores the actual SHA1, which is what I was looking for. git-rebase.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/git-rebase.sh b/git-rebase.sh index e2d85ee..44db7e6 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -434,3 +434,4 @@ do done finish_rb_merge +git update-ref ORIG_HEAD $orig_head -- 1.5.6.2.337.gf6537 ```