X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/47d179802d5f78365fa7077ae64de35f2892a1e4..8211910566922dc66a09fa73286bb311de456afa:/doc/rcs/git.mdwn?ds=sidebyside diff --git a/doc/rcs/git.mdwn b/doc/rcs/git.mdwn index 98daf66da..b210af825 100644 --- a/doc/rcs/git.mdwn +++ b/doc/rcs/git.mdwn @@ -17,11 +17,7 @@ shallow, single level tree, with a bare repository (meaning that it does not have a working tree checked out) at the root, and various working clones (with working directories) as leaf nodes. The root (bare) repository is meant to be pushed to and pulled from the various -working clones. The image below displays the relationship between the -root repository and the clone repositories (this is not a directory -layout): - -![Git repository relationships](http://people.debian.org/~srivasta/ikiwiki_git.png) +working clones. One of the leaf node clone repositories is special; it has working directory which is used to compile the wiki from, and is also used by the @@ -138,3 +134,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 '). + 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 = + branch.master.merge = + remote..url = + remote..fetch = + + See git-config(1) for details. + +The solution is to run this command in your srcdir: + + git config branch.master.remote origin