Re: Rebasing multiple branches

From: Leonid Podolny <leonidp.lists@gmail.com>
Date: Dec 22, 2010, 14:54 UTC
Message-ID: <4D121136.6050906@gmail.com>
In-Reply-To: <20101222143654.GA4829@nibiru.local>

On 12/22/2010 04:36 PM, Enrico Weigelt wrote:

Show 21 quoted lines

> Why not this way ?
>
> git checkout D
> git rebase -p -i D~3 --onto C'
>
> (C' is the merged branch of A' and B').
>
>
> So:
>
> git checkout branch_A -b rebasing_A
> git rebase master			# rebase old A to master
> git checkout branch_B -b rebasing_B
> git rebase master			# rebase old B to master
> git checkout -b rebased_merge
> git merge rebasing_A			# we're on B', merge in A'
> git checkout branch_C
> git rebase -p -i C --onto rebased_merge # set D~3..D ontop of it
>
>
> cu

Ah, nice. I didn't notice the -p option. However, the man page advises against using -p and -i together.