git fetch rebase

You've branched out, made some commits, then you
need the latest from master. On your branch:

git fetch origin
git rebase origin