From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23112 invoked by alias); 29 Oct 2013 06:33:20 -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 23089 invoked by uid 89); 29 Oct 2013 06:33:19 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=1.3 required=5.0 tests=AWL,BAYES_00,GARBLED_BODY autolearn=no version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 29 Oct 2013 06:33:18 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1Vb2rX-00030w-9u from Yao_Qi@mentor.com ; Mon, 28 Oct 2013 23:33:11 -0700 Received: from SVR-ORW-FEM-03.mgc.mentorg.com ([147.34.97.39]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Mon, 28 Oct 2013 23:33:10 -0700 Received: from qiyao.dyndns.org (147.34.91.1) by svr-orw-fem-03.mgc.mentorg.com (147.34.97.39) with Microsoft SMTP Server id 14.2.247.3; Mon, 28 Oct 2013 23:32:16 -0700 Message-ID: <526F55C1.5040708@codesourcery.com> Date: Tue, 29 Oct 2013 06:33:00 -0000 From: Yao Qi User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 MIME-Version: 1.0 To: Cary Coutant CC: Pedro Alves , 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="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-IsSubscribed: yes X-SW-Source: 2013-10/txt/msg00177.txt.bz2 On 10/29/2013 06:35 AM, 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.) 'git rebase --onto new-branch BRANCH_POINT old-branch' works for me. BRANCH_POINT is the commit id of master that your old-branch is created against. I switched my origin to the new repo, and do 'git rebase --onto master BRANCH_POINT old-branch' for my every local branch, but have to check BRANCH_POINT manually for every local branch. -- Yao (齐尧)