This is the mail archive of the
mailing list for the binutils project.
Re: git is live
- From: Pedro Alves <palves at redhat dot com>
- To: Cary Coutant <ccoutant at google dot com>
- Cc: 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 19:19:20 +0000
- 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/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.