From: Brian Gernhardt Date: Sun, 06 Jul 2008 16:16:03 GMT Subject: [PATCH v3] Make rebase save ORIG_HEAD if changing current branch Message-ID: <1215360963-85805-1-git-send-email-benji@silverinsanity.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