Rebasing

git rebase in the Atlassian Git Tutorial has a nice overview of this command.

# Rebase the current branch by appying them to the passed branch.
git rebase <branchName>

# Continue a rebase.
git rebase --continue