Autogenerated HTML docs for v1.4.3.2-g125940

diff --git a/config.txt b/config.txt
index 05d657444fc31768f9bf9909324b708ac6fcfd46..026d4cf9ade90cd108d351e372ed862378cde100 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -230,6 +230,18 @@ pull.octopus::
 pull.twohead::
        The default merge strategy to use when pulling a single branch.
 
+remote.<name>.url::
+       The URL of a remote repository.  See gitlink:git-fetch[1] or
+       gitlink:git-push[1].
+
+remote.<name>.fetch::
+       The default set of "refspec" for gitlink:git-fetch[1]. See
+       gitlink:git-fetch[1].
+
+remote.<name>.push::
+       The default set of "refspec" for gitlink:git-push[1]. See
+       gitlink:git-push[1].
+
 repack.usedeltabaseoffset::
        Allow gitlink:git-repack[1] to create packs that uses
        delta-base offset.  Defaults to false.

diff --git a/git-fetch.html b/git-fetch.html
index bd635fd5f37f69bbe98508296a979c92e6932c2d..021522b7c817bbef5e7ef8844bf63b651e0b6346 100644 (file)
--- a/git-fetch.html
+++ b/git-fetch.html
@@ -568,6 +568,14 @@ line, &lt;refspec&gt; specified on <tt>Push:</tt> lines or <tt>Pull:</tt>
 lines are used for <tt>git-push</tt> and <tt>git-fetch</tt>/<tt>git-pull</tt>,\r
 respectively.  Multiple <tt>Push:</tt> and <tt>Pull:</tt> lines may\r
 be specified for additional branch mappings.</p>\r
+<p>Or, equivalently, in the <tt>$GIT_DIR/config</tt> (note the use\r
+of <tt>fetch</tt> instead of <tt>Pull:</tt>):</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>url = &lt;url&gt;\r
+push = &lt;refspec&gt;\r
+fetch = &lt;refspec&gt;</tt></pre>\r
+</div></div>\r
 <p>The name of a file in <tt>$GIT_DIR/branches</tt> directory can be\r
 specified as an older notation short-hand; the named\r
 file should contain a single line, a URL in one of the\r
@@ -607,7 +615,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Oct-2006 08:41:04 UTC\r
+Last updated 24-Oct-2006 05:43:59 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-pull.html b/git-pull.html
index cf2254fc120aa559e21594b219d3c48288f4450c..70f714fb4a861ad1ca9350fa790d9dd381b21479 100644 (file)
--- a/git-pull.html
+++ b/git-pull.html
@@ -612,6 +612,14 @@ line, &lt;refspec&gt; specified on <tt>Push:</tt> lines or <tt>Pull:</tt>
 lines are used for <tt>git-push</tt> and <tt>git-fetch</tt>/<tt>git-pull</tt>,\r
 respectively.  Multiple <tt>Push:</tt> and <tt>Pull:</tt> lines may\r
 be specified for additional branch mappings.</p>\r
+<p>Or, equivalently, in the <tt>$GIT_DIR/config</tt> (note the use\r
+of <tt>fetch</tt> instead of <tt>Pull:</tt>):</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>url = &lt;url&gt;\r
+push = &lt;refspec&gt;\r
+fetch = &lt;refspec&gt;</tt></pre>\r
+</div></div>\r
 <p>The name of a file in <tt>$GIT_DIR/branches</tt> directory can be\r
 specified as an older notation short-hand; the named\r
 file should contain a single line, a URL in one of the\r
@@ -809,7 +817,7 @@ Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Oct-2006 08:41:18 UTC\r
+Last updated 24-Oct-2006 05:43:59 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-push.html b/git-push.html
index 38c815670516d03ebee8556056ebe89530196c2a..b323bf0e07e337b4084a86ac8fe1a10c72d21265 100644 (file)
--- a/git-push.html
+++ b/git-push.html
@@ -468,6 +468,14 @@ line, &lt;refspec&gt; specified on <tt>Push:</tt> lines or <tt>Pull:</tt>
 lines are used for <tt>git-push</tt> and <tt>git-fetch</tt>/<tt>git-pull</tt>,\r
 respectively.  Multiple <tt>Push:</tt> and <tt>Pull:</tt> lines may\r
 be specified for additional branch mappings.</p>\r
+<p>Or, equivalently, in the <tt>$GIT_DIR/config</tt> (note the use\r
+of <tt>fetch</tt> instead of <tt>Pull:</tt>):</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>url = &lt;url&gt;\r
+push = &lt;refspec&gt;\r
+fetch = &lt;refspec&gt;</tt></pre>\r
+</div></div>\r
 <p>The name of a file in <tt>$GIT_DIR/branches</tt> directory can be\r
 specified as an older notation short-hand; the named\r
 file should contain a single line, a URL in one of the\r
@@ -502,7 +510,7 @@ Pull: refs/heads/&lt;head&gt;:&lt;remote&gt;</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Oct-2006 08:41:19 UTC\r
+Last updated 24-Oct-2006 05:44:00 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-repo-config.html b/git-repo-config.html
index 3a7dc5a5473b5ff86a10dd383a5ce9900b46f46f..1e0b2cddbccf99da4d4b37c3349a7cb71f1ca1ee 100644 (file)
--- a/git-repo-config.html
+++ b/git-repo-config.html
@@ -914,6 +914,33 @@ pull.twohead
 </p>\r
 </dd>\r
 <dt>\r
+remote.&lt;name&gt;.url\r
+</dt>\r
+<dd>\r
+<p>\r
+        The URL of a remote repository.  See <a href="git-fetch.html">git-fetch(1)</a> or\r
+        <a href="git-push.html">git-push(1)</a>.\r
+</p>\r
+</dd>\r
+<dt>\r
+remote.&lt;name&gt;.fetch\r
+</dt>\r
+<dd>\r
+<p>\r
+        The default set of "refspec" for <a href="git-fetch.html">git-fetch(1)</a>. See\r
+        <a href="git-fetch.html">git-fetch(1)</a>.\r
+</p>\r
+</dd>\r
+<dt>\r
+remote.&lt;name&gt;.push\r
+</dt>\r
+<dd>\r
+<p>\r
+        The default set of "refspec" for <a href="git-push.html">git-push(1)</a>. See\r
+        <a href="git-push.html">git-push(1)</a>.\r
+</p>\r
+</dd>\r
+<dt>\r
 repack.usedeltabaseoffset\r
 </dt>\r
 <dd>\r
@@ -1045,7 +1072,7 @@ receive.denyNonFastforwads
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 23-Oct-2006 07:18:40 UTC\r
+Last updated 24-Oct-2006 05:44:00 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/urls.txt b/urls.txt
index 26ecba53fbfad4af4da46680330f998bf92f1b3f..670827c323fe276124ba1a84d59386771db868f1 100644 (file)
--- a/urls.txt
+++ b/urls.txt
@@ -51,6 +51,14 @@ lines are used for `git-push` and `git-fetch`/`git-pull`,
 respectively.  Multiple `Push:` and `Pull:` lines may
 be specified for additional branch mappings.
 
+Or, equivalently, in the `$GIT_DIR/config` (note the use
+of `fetch` instead of `Pull:`):
+
+[remote "<remote>"]
+       url = <url>
+       push = <refspec>
+       fetch = <refspec>
+
 The name of a file in `$GIT_DIR/branches` directory can be
 specified as an older notation short-hand; the named
 file should contain a single line, a URL in one of the