Rebasing one branch onto another

Ok, I’m tired of looking this up, so I’m going to document it here for future me.

We have a branching strategy:

maint-2014.04.04
maint-2014.04.18
…
master

When I create a new branch based off master, I name it 1234567890_some_short_summary_master.

Later I determine it should have been based off maint-2014.04.04.

Here’s the process:
[code]
git checkout 1234567890_some_short_summary_master
git fetch upstream
git rebase upstream/master
git rebase –onto upstream/maint-2014.04.04 upstream/master 1234567890_some_short_summary_master
git branch -m 1234567890_some_short_summary_master 1234567890_some_short_summary_0404
[/code]

If this helps you, please let me know! 🙂

Source: git rebase –onto