Re: Rebasing Multiple branches at once...

On Fri, Oct 17 2008, Rick Moynihan wrote:

Hi,

I have a master branch, a dev branch and a number of feature branches
from dev.  And I was wondering if there was an easy way to rebase dev
and all of it's sub-branches onto master.

I know I can run this as a series of commands, and use --onto to do
this, but was wondering if there was an easier way.  As running:

git rebase master

when on the dev branch only rebases dev and not it's dependent
branches.

I have a Perl script I use to rebase a number of topic branches as the
remote tracking branches they're based on move.  It handles the case of
topic based on other topics.  It is designed specifically for my
workflow, which is tracking a central Subversion repository using
git-svn, but I don't think it relies on using git-svn.  Anyway, you
might find it useful for inspiration.

The script outputs a sequence of commands and leaves the running of them
up to you because you may need to resolve conflicts at any point.

Regards,
Toby.