From: Andreas Schwab <schwab@linux-m68k.org>
Date: Sun, 06 Jun 2010 22:19:40 GMT
Subject: Re: Moving a branch to a different node
Message-ID: <m2hblfregz.fsf@igel.home>
In-Reply-To: <C831D94B.1D9DF%mikesol@ufl.edu>

Mike Solomon <mikesol@UFL.EDU> writes:

> Hey git users,
>     I am working on a project where I proceeded by the following steps:
>
> starting from master...
> 1) create branch foo
> 2) work in foo, make some commits, then a patch named Foo
> 3) create a branch bar while in foo
> 4) work in bar, make some commits, then a patch named Bar
>
> git show-branch gives me
>
> ! [master] Hello
>  * [foo] Foo
>   ! [bar] Bar
>
> I would like to make bar split off of master instead of foo so that I can
> format a patch that can be applied to master (Bar) without having to first
> apply Foo.  Is there a way to do that?

IIUC you want to rebase the commits in bar that are not in foo onto
master.

$ git rebase --onto master foo bar

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."