Re: Rebasing Multiple branches at once...

From: Robin Burchell <w00t@inspircd.org>
Date: Oct 16, 2008, 15:02 UTC
Message-ID: <b19eae4e0810160802x3e91cf48oebe668dc1b6425df@mail.gmail.com>
In-Reply-To: <48F75657.6010308@calicojack.co.uk>

On Thu, Oct 16, 2008 at 3:57 PM, Rick Moynihan <rick@calicojack.co.uk> wrote:

Show 32 quoted lines

>
> This appears to be true of the current implementation, but shouldn't it be
> possible to do this as a single operation?
>
> e.g. when the situation is this with dev being the current branch.
>
> o---o---o---o---o  master
>     \
>      o---o---o---o---o  dev (*)
>                       \
>                        o---o---o  topic
>
> Running the hypothetical command:
>
> git rebase master --all
>
> Would produce this:
>
> o---o---o---o---o  master
>                 \
>                  o---o---o---o---o  dev (*)
>                                   \
>                                    o---o---o  topic
>
> I think this can be performed right now with a rebase followed by a rebase
> --onto
>
> I can see how if there were conflicts in the rebase from dev, then you would
> need to resolve them all the way up your topic branches also.  Is there
> anything else that makes this a bad idea?
>
> R.

Rebase is indeed useful IMHO in situations like this with multiple related topic branches when needing to pull a single fix or two from somewhere without messy merges (especially when that will end up with rather a lot of merge commits in history - one or so for each branch, which is not exactly desirable).

(resent after I learned how to use 'reply to all', sorry Rick)