From: Junio C Hamano <junio@hera.kernel.org>
Date: Fri, 16 Mar 2007 10:21:14 +0000 (+0000)
Subject: Autogenerated man pages for v1.5.0.4-404-gdbb2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d806217d270710d1957831917040fabf8052c3c8;p=git.git

Autogenerated man pages for v1.5.0.4-404-gdbb2
---

diff --git a/man1/git-config.1 b/man1/git-config.1
index b15934601..7c3943fbd 100644
--- a/man1/git-config.1
+++ b/man1/git-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\-CONFIG" "1" "03/15/2007" "" ""
+.TH "GIT\-CONFIG" "1" "03/16/2007" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -331,7 +331,7 @@ branch.<name>.remote
 When in branch <name>, it tells git 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 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.
+When in branch <name>, it tells git fetch 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. If you wish to setup git pull so that it merges into <name> from another branch in the local repository, you can point branch.<name>.merge to the desired branch, and use the special setting . (a period) for branch.<name>.remote.
 .TP
 color.branch
 A boolean to enable/disable color in the output of \fBgit\-branch\fR(1). May be set to true (or always), false (or never) or auto, in which case colors are used only when the output is to a terminal. Defaults to false.