summaryrefslogtreecommitdiffstats
path: root/git-fetch.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2006-12-31 08:29:35 +0000
committerJunio C Hamano <junio@hera.kernel.org>2006-12-31 08:29:35 +0000
commit1caaf47fc4409328ee5086d389322ea8829cdff8 (patch)
treed4b19fca448c84caaed5824f9f4995f3fa910333 /git-fetch.html
parent775a0f4855989aa6804034eafaf38b828e63f151 (diff)
downloadgit-htmldocs-1caaf47fc4409328ee5086d389322ea8829cdff8.tar.gz
Autogenerated HTML docs for v1.5.0-rc0-g2708
Diffstat (limited to 'git-fetch.html')
-rw-r--r--git-fetch.html17
1 files changed, 9 insertions, 8 deletions
diff --git a/git-fetch.html b/git-fetch.html
index 021522b7c..93806b28e 100644
--- a/git-fetch.html
+++ b/git-fetch.html
@@ -556,7 +556,7 @@ identical to the last three above, respectively:</p>
<p>In addition to the above, as a short-hand, the name of a
file in <tt>$GIT_DIR/remotes</tt> directory can be given; the
named file should be in the following format:</p>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
<pre><tt>URL: one of the above URL format
Push: &lt;refspec&gt;
@@ -570,11 +570,12 @@ respectively. Multiple <tt>Push:</tt> and <tt>Pull:</tt> lines may
be specified for additional branch mappings.</p>
<p>Or, equivalently, in the <tt>$GIT_DIR/config</tt> (note the use
of <tt>fetch</tt> instead of <tt>Pull:</tt>):</p>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
-<pre><tt>url = &lt;url&gt;
-push = &lt;refspec&gt;
-fetch = &lt;refspec&gt;</tt></pre>
+<pre><tt>[remote "&lt;remote&gt;"]
+ url = &lt;url&gt;
+ push = &lt;refspec&gt;
+ fetch = &lt;refspec&gt;</tt></pre>
</div></div>
<p>The name of a file in <tt>$GIT_DIR/branches</tt> directory can be
specified as an older notation short-hand; the named
@@ -584,13 +585,13 @@ name of remote head (URL fragment notation).
<tt>$GIT_DIR/branches/&lt;remote&gt;</tt> file that stores a &lt;url&gt;
without the fragment is equivalent to have this in the
corresponding file in the <tt>$GIT_DIR/remotes/</tt> directory.</p>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
<pre><tt>URL: &lt;url&gt;
Pull: refs/heads/master:&lt;remote&gt;</tt></pre>
</div></div>
<p>while having <tt>&lt;url&gt;#&lt;head&gt;</tt> is equivalent to</p>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
<pre><tt>URL: &lt;url&gt;
Pull: refs/heads/&lt;head&gt;:&lt;remote&gt;</tt></pre>
@@ -615,7 +616,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 24-Oct-2006 05:43:59 UTC
+Last updated 31-Dec-2006 08:29:25 UTC
</div>
</div>
</body>