git rebase

git pull --rebase origin master

First fetch the new master from the upstream repository, then rebase your work branch on that:


git fetch origin            # Updates origin/master
git rebase origin/master    # Rebases current branch onto origin/master