git pull --rebase origin master

And for advanced sorcery:

git config alias.update 'pull --rebase origin master'

Now you can just hit git update.