From mboxrd@z Thu Jan 1 00:00:00 1970 From: Brian Gernhardt Subject: [PATCH v3] Make rebase save ORIG_HEAD if changing current branch Date: Sun, 6 Jul 2008 12:16:03 -0400 Message-ID: <1215360963-85805-1-git-send-email-benji@silverinsanity.com> References: <1215333658-84938-1-git-send-email-benji@silverinsanity.com> Cc: Junio C Hamano To: Git List X-From: git-owner@vger.kernel.org Sun Jul 06 18:17:07 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1KFWvB-000111-O2 for gcvg-git-2@gmane.org; Sun, 06 Jul 2008 18:17:06 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757455AbYGFQQH (ORCPT ); Sun, 6 Jul 2008 12:16:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757447AbYGFQQH (ORCPT ); Sun, 6 Jul 2008 12:16:07 -0400 Received: from vs072.rosehosting.com ([216.114.78.72]:35204 "EHLO silverinsanity.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757372AbYGFQQG (ORCPT ); Sun, 6 Jul 2008 12:16:06 -0400 Received: from localhost.localdomain (cpe-69-205-115-17.rochester.res.rr.com [69.205.115.17]) by silverinsanity.com (Postfix) with ESMTP id 0830F1FFC021; Sun, 6 Jul 2008 16:15:59 +0000 (UTC) X-Mailer: git-send-email 1.5.6.2.337.gf6537 In-Reply-To: <1215333658-84938-1-git-send-email-benji@silverinsanity.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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