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 pullIt goes on to say that you can make an addition to .git/cofig to correct the underlying issue. I think that is too many keystrokes. Use the handy git config command to make those changes for you:
'). See git-pull(1) for details.
git config branch.master.remote originThis is probably going to happen again, so lets add a git alias:
git config branch.master.merge refs/heads/master
git config --global alias.fixmaster \Now if you get this error again, just type git fixmaster.
'!git config branch.master.remote origin && \
git config branch.master.merge refs/heads/master'