Autogenerated HTML docs for v1.5.0.4-404-gdbb2

diff --git a/config.txt b/config.txt
index aaae9ac3052b5a4de6ec53817e79797626f7da31..953acaee4c9b692802a4e98861dac8ceec315d54 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -272,6 +272,10 @@ branch.<name>.merge::
        `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.
 
 color.branch::
        A boolean to enable/disable color in the output of

diff --git a/git-config.html b/git-config.html
index cbcf4d622ded647aba77013c02a80f75165f4a0c..ba6802199d7368ddbe3ac85b3659c984a7b85ede 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -920,6 +920,10 @@ branch.<name>.merge
         <tt>git fetch</tt>) to lookup the default branch for merging. Without\r
         this option, <tt>git pull</tt> defaults to merge the first refspec fetched.\r
         Specify multiple values to get an octopus merge.\r
+        If you wish to setup <tt>git pull</tt> so that it merges into &lt;name&gt; from\r
+        another branch in the local repository, you can point\r
+        branch.&lt;name&gt;.merge to the desired branch, and use the special setting\r
+        <tt>.</tt> (a period) for branch.&lt;name&gt;.remote.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -1519,7 +1523,7 @@ transfer.unpackLimit
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Mar-2007 07:12:11 UTC\r
+Last updated 16-Mar-2007 10:20:49 UTC\r
 </div>\r
 </div>\r
 </body>\r