From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21448 invoked by alias); 29 Oct 2013 19:19:26 -0000 Mailing-List: contact gdb-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-owner@sourceware.org Received: (qmail 21431 invoked by uid 89); 29 Oct 2013 19:19:25 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 29 Oct 2013 19:19:24 +0000 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r9TJJMRk009452 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 29 Oct 2013 15:19:22 -0400 Received: from [127.0.0.1] (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r9TJJKW3010759; Tue, 29 Oct 2013 15:19:21 -0400 Message-ID: <52700A38.40503@redhat.com> Date: Tue, 29 Oct 2013 19:19:00 -0000 From: Pedro Alves User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130625 Thunderbird/17.0.7 MIME-Version: 1.0 To: Cary Coutant CC: Tom Tromey , GDB Development , Binutils Development Subject: Re: git is live References: <877gd5iyaz.fsf@fleche.redhat.com> <5266CCDC.6090803@redhat.com> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-SW-Source: 2013-10/txt/msg00184.txt.bz2 On 10/28/2013 10:35 PM, Cary Coutant wrote: > I got this far with no problems (thanks!), but my old branches don't > seem to have any common commits with the new binutils-gdb/master. Are > you doing the rebase with an explicit merge-base (e.g., "git branch > new-branch binutils-gdb/master; git rebase --onto new-branch > old-master old-branch")? Or should "git rebase binutils-gdb/master > old-branch" work? (I'm hesitant to try that.) Yeah, as others have said, use "git rebase --onto new-branch". I actually use stgit myself, so I do "stg rebase $BRANCH", which rebases the patch series (applied or not) on top of any branch (IOW, it already does the equivalent of --onto) so this question doesn't even arise for me. -- Pedro Alves