git branch merge issue on live www site

[https://id.mayfirst.org/malloryk]

I'm unable to pull in changes to the live www site. This is the error message that I receive.

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
name which branch you want to merge on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details on the refspec.

If you often merge with the same branch, you may want to
configure the following variables in your configuration
file:

    branch.master.remote = <nickname>
    branch.master.merge = <remote-ref>
    remote.<nickname>.url = <url>
    remote.<nickname>.fetch = <refspec>

See git-config(1) for details.

[https://id.mayfirst.org/jamie]

I believe there is a configuration option that says: pull from this place when you just type pull. I'm not sure if that's been intentionally changed or not.

I just made the update by following these steps:

cd www.ussf2010.org
# fetch changes
git fetch
# view changes
git diff origin/master
# merge changes
git merge origin/master

I also updated our directions to include these steps which I think might be a better approach because it gives us the ability to review what is going to be merged before actually doing the merge.