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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html