A friendly cheatsheet that answers the questions I find myself asking embarrassingly often...
git fetch origin # update everything you're not working on
git diff master origin/master # see what's changed
git merge origin/master # update what you're working on