How can I rebase multiple branches at once?

Question

I currently work on a project in which SVN is used as a repository. Locally, I do several "experiments" with the code that I don't want to commit to the repo. Therefore I use git locally on top of the SVN working directory and use multiple branches for different "experiments". So it looks e.g. like this.

C0 ---- C7 (master)
 \
  \---- C1 ---- C2 ---- C4 (exp1)
   \     \       \
    \     \       \---- C3 (exp2)
     \     \
      \     \---- C5 (exp3)
       \
        \---- C6 (exp4)

On branch master I want to have the untainted SVN repo, i.e. C0 is SVN Repo Revision x and C7 is SVN Repo Revision x + n.

Is it somehow easily possible to rebase all the exp branches onto C7 at once in such a way that the tree will look like the following diagram?

C0 ---- C7 (master)
         \
          \---- C1' ---- C2' ---- C4' (exp1)
           \     \         \
            \     \         \---- C3' (exp2)
             \     \
              \     \---- C5' (exp3)
               \
                \---- C6' (exp4)

I want to use rebase since I don't want to modify the state of my local SVN Checkout and want to have my changes built on top of the SVN revisions.

I'm also interested in solutions that work from within SourceTree without having to use the shell.

Answer 1

You can't get this in one step. At best you move each branch one by one; this would be the sequence:

git rebase --onto master exp1
git rebase --onto c2' c2 exp2
git rebase --onto c1' c1 exp3
git rebase --onto master exp4

The key is to rebase from each branch point in the old tree (e.g. c2 in the above) on to the new tree (e.g. c2' in the above).

Answer 2

As GoZoner answered, there's no way of doing this using the bare git commands, but it's doable to support this kind of rebasing through a script that combines various git plumbing commands.

I wrote a working example, you can find it on github

Answer 3

I just want to mention that GoZoner's sequence has a mistake in the first (and last) line. exp1 is not the upstream, but the branch you want to rebase.

In order to start the sequence, you need to have master as upstream, i.e. git rebase --onto master master exp1 or short, without --onto it would be git rebase master exp1. The total correct sequence for the example from the question would then be:

git rebase master exp1
git rebase --onto c2' c2 exp2
git rebase --onto c1' c1 exp3
git rebase master exp4

Answer 4

You can rebase multiple branches / trees with a small trick.

1. Create a DUMMY_BRANCH e.g. at location of master
2. Merge all branches you like to move into DUMMY_BRANCH
3. rebase DUMMY_BRANCH to your desired new point and add --preserve-merges option to your rebase-command
4. After rebasing manually each of you branches to the rebased commits (e.g. for C4 git reset --hard [Commit-hash of C4' (exp1)]
5. when you have moved all your branches, delete the rebased DUMMY_BRANCH