You can also explicitly tell git pull what remote branch to pull (as it mentions in the error message):
git pull
Be careful with this, however: if you are on a different branch and do an explicit pull, the refspec you pull will be merged into the branch you're on!