I'm not a git master, but I have been working with it for some time now, with several different projects. In each project, I always
git clone [repository]
git checkout 4f82a29
git pull origin master
-bash-3.1$ cat config
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
url = email@example.com:user/project.git
fetch = refs/heads/*:refs/remotes/origin/*
-bash-3.1$ git pull
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 ').
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
See git-config(1) for details.
[branch "master"], try adding the following to the repo's Git config file (
[branch "master"] remote = origin merge = refs/heads/master
This tells Git 2 things:
git pullon the master branch, with no remote and branch specified, use the default remote (origin) and merge in the changes from the remote master branch.
I'm not sure why this setup would've been removed from your configuration, though. You may have to follow the suggestions that other people have posted, too, but this may work (or help at least).
If you don't want to edit the config file by hand, you can use the command-line tool instead:
$ git config branch.master.remote origin $ git config branch.master.merge refs/heads/master