> git pull origin master

I think in general, as well as this particular case, it would be better to do

  git fetch origin

One doesn't always want to merge from the remote branch.