From: Clemens Buchacher <drizzd@aon.at>
Date: Sat, 16 May 2009 13:49:06 GMT
Subject: Re: Rebase a whole tree from one commit to another?
Message-ID: <20090516134906.GA19110@localhost>
In-Reply-To: <4A0DC4CD.1030401@dirk.my1.cc>

On Fri, May 15, 2009 at 09:38:53PM +0200, Dirk Süsserott wrote:
>
>     git rebase new-master branch-a
>     git rebase branch-a   branch-b
>     git rebase branch-b   branch-c
>

You probably want something like

	git rebase new-master branch-a
	git rebase --onto branch-a branch-a@{1} branch-b
	git rebase --onto branch-b branch-b@{1} branch-c

instead, because if you have any conflicts during rebase, the rebased
commits will no longer be recognized as identical, causing even more
conflicts in the following rebases.