From: Junio C Hamano <junio@hera.kernel.org>
Date: Sat, 9 Dec 2006 21:15:50 +0000 (+0000)
Subject: Autogenerated man pages for v1.4.4.2-g4cfec
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d78f71bb2723e4a32bea5e66dac9b8236a67e012;p=git.git

Autogenerated man pages for v1.4.4.2-g4cfec
---

diff --git a/man1/git-repo-config.1 b/man1/git-repo-config.1
index 8cbae49e9..a10532ad7 100755
--- a/man1/git-repo-config.1
+++ b/man1/git-repo-config.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-REPO\-CONFIG" "1" "11/29/2006" "" ""
+.TH "GIT\-REPO\-CONFIG" "1" "12/09/2006" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -281,12 +281,19 @@ option. See
 branch.<name>.remote
 When in branch <name>, it tells
 git fetch
-which remote to fetch.
+which remote to fetch. If this option is not given,
+git fetch
+defaults to remote "origin".
 .TP
 branch.<name>.merge
 When in branch <name>, it tells
 git fetch
-the default remote branch to be merged.
+the default refspec to be marked for merging in FETCH_HEAD. The value has exactly to match a remote part of one of the refspecs which are fetched from the remote given by "branch.<name>.remote". The merge information is used by
+git pull
+(which at first calls
+git fetch) to lookup the default branch for merging. Without this option,
+git pull
+defaults to merge the first refspec fetched. Specify multiple values to get an octopus merge.
 .TP
 pager.color
 A boolean to enable/disable colored output when the pager is in use (default is true).