With the git-rebase command, you can take the changes from one branch and replay them on top of another branch.
