Skip to content

Instantly share code, notes, and snippets.

@paltman
Created October 24, 2008 03:31
Show Gist options
  • Save paltman/19337 to your computer and use it in GitHub Desktop.
Save paltman/19337 to your computer and use it in GitHub Desktop.
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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment