git rebase

Forward-port local commits to the updated upstream head.

git rebase is one of the two main ways to integrate changes from one branch into another, the other is git merge.