Topics:
If you get the befuddling message:
Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded
you can just run:
git pull
Or, if that doesn't work:
git pull origin master
(I think.)
The above might seem obvious to some, but Googling "git fast forward" proved surprisingly unfruitful. HTH.