Re: Q: rebasing (moving) a whole tree (not just one branch)

From: Johannes Sixt <j6t@kdbg.org>
Date: Mar 18, 2011, 22:53 UTC
Message-ID: <201103182353.24517.j6t@kdbg.org>
In-Reply-To: <7vaagsw2qb.fsf@alter.siamese.dyndns.org>

On Freitag, 18. März 2011, Junio C Hamano wrote:

Show 21 quoted lines

> Jonathan Nieder <jrnieder@gmail.com> writes:
> > Dirk Süsserott wrote:
> >> I'd like to rebase a whole tree from A to B. Not just a single
> >> branch, but a whole tree. Let's say I have the following history:
> >>
> >> --- A --- B
> >>
> >>     + -- C -- D
> >>
> >>          + E -- F
> >>
> >> I'd like to rebase C and its descendants from A to B
> >
> > I'd suggest cheating by making a merge of D and F and "rebase -p"-ing
> > that. :)
> >
> > To say something more sensible would probably require more information
> > about the particular application, though.
>
> I am not a huge fan of filter-branch, but shouldn't you be able to
> filter-branch D and F (and no other branch) on top of B?

Not in a trival way. You would need a tree-filter that re-applies the change between A and B to every transcribed commit. That will work well only if there are no conflicts.

-- Hannes