This is the mail archive of the
mailing list for the binutils project.
Re: git is live
- From: Yao Qi <yao at codesourcery dot com>
- To: Cary Coutant <ccoutant at google dot com>
- Cc: Pedro Alves <palves at redhat dot com>, Tom Tromey <tromey at redhat dot com>, GDB Development <gdb at sourceware dot org>, Binutils Development <binutils at sourceware dot org>
- Date: Tue, 29 Oct 2013 14:29:21 +0800
- Subject: Re: git is live
- Authentication-results: sourceware.org; auth=none
- References: <877gd5iyaz dot fsf at fleche dot redhat dot com> <CAHACq4o_Lgy7G5c9rRLB1tijmEngrOn8UgsQVdrnk9j8o1=D1A at mail dot gmail dot com> <5266CCDC dot 6090803 at redhat dot com> <CAHACq4qqw4MZznnW7zAnOMW2kHEYRRyymAphoEiY1Of5Qeks8w at mail dot gmail dot com>
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
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.