Skip to content

Instantly share code, notes, and snippets.

@andydude
Created March 14, 2012 06:42
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save andydude/2034667 to your computer and use it in GitHub Desktop.
Save andydude/2034667 to your computer and use it in GitHub Desktop.
$ git fetch
...
$ git pull
You asked me to pull without telling me which branch you
want to merge with, and 'branch.andrew-working.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 <repository> <refspec>').
See git-pull(1) for details.
If you often merge with the same branch, you may want to
use something like the following in your configuration file:
[branch "andrew-working"]
remote = <nickname>
merge = <remote-ref>
[remote "<nickname>"]
url = <url>
fetch = <refspec>
See git-config(1) for details.
$ git pull master
fatal: 'master' does not appear to be a git repository
fatal: The remote end hung up unexpectedly
$ git branch
* andrew-working
master
$ git status
...
$ emacs .git/config
...
$ git pull
Already up-to-date.
$ git checkout
M parse.mk
$ git checkout master
M parse.mk
Switched to branch 'master'
Your branch is behind 'origin/master' by 11 commits, and can be fast-forwarded.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment