diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/rcs/git.mdwn | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/doc/rcs/git.mdwn b/doc/rcs/git.mdwn index 98daf66da..9b6f2c36a 100644 --- a/doc/rcs/git.mdwn +++ b/doc/rcs/git.mdwn @@ -138,3 +138,28 @@ have a hook that is run locally after pulling changes. Newer versions of git will have a `post-merge` hook that should work for this purpose. +## Fix for error on git pull origin + +Error message when running git pull origin: + + 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. + +The solution is to run this command in your srcdir: + + git config branch.master.remote origin |