'Git Tip: Setting Up Your Remote Server'
You asked me to pull without telling me which branch you want to merge with, and ‘branch.master.merge’ in your configuration file does not tell me, either. Please specify which branch you want to use on the command line and try again (e.g. ‘git pull ‘). See git-pull(1) for details.
Well, fortunately it’s pretty easy to fix. Edit your .git/config, adding the remote and merge lines under your master branch.
[branch "master"] remote = origin merge = refs/heads/master
Next time you’re on the master branch and pull, it’ll fetch the latest code off the master branch on the origin and merge into your local master.