From: Johannes Sixt <j.sixt@viscovery.net>
Date: Tue, 21 Dec 2010 14:06:05 GMT
Subject: Re: Rebasing multiple branches
Message-ID: <4D10B44D.5090309@viscovery.net>
In-Reply-To: <4D10AE5B.2080700@gmail.com>

Am 12/21/2010 14:40, schrieb Leonid Podolny:
>         B--o--o--o--o--o--o  <--branch A
>        /                   \
> o--o--A--o--E  <--master    C--o--o--o--D  <--branch C
>        \                   /
>         C--o--o--o--o--o--o  <--branch B
> 
> I would like to rebase all three branches A, B and C onto commit E,...

git rebase master A
git rebase master B
git merge A
git rebase -i HEAD C

The last rebase I propose as interactive so that you can remove those
commits before D~3 that you have already rebased, because they are likely
to conflict unnecessarily, and you would --skip them anyway.

(Note: "C" is the branch C, not the commit C. Please make labels
unambiguous next time.)

-- Hannes