diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2006-12-31 08:29:35 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2006-12-31 08:29:35 +0000 |
commit | 1caaf47fc4409328ee5086d389322ea8829cdff8 (patch) | |
tree | d4b19fca448c84caaed5824f9f4995f3fa910333 /git-fetch.html | |
parent | 775a0f4855989aa6804034eafaf38b828e63f151 (diff) | |
download | git-htmldocs-1caaf47fc4409328ee5086d389322ea8829cdff8.tar.gz |
Autogenerated HTML docs for v1.5.0-rc0-g2708
Diffstat (limited to 'git-fetch.html')
-rw-r--r-- | git-fetch.html | 17 |
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: <refspec>
@@ -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 = <url>
-push = <refspec>
-fetch = <refspec></tt></pre>
+<pre><tt>[remote "<remote>"]
+ url = <url>
+ push = <refspec>
+ fetch = <refspec></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/<remote></tt> file that stores a <url>
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: <url>
Pull: refs/heads/master:<remote></tt></pre>
</div></div>
<p>while having <tt><url>#<head></tt> is equivalent to</p>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
<pre><tt>URL: <url>
Pull: refs/heads/<head>:<remote></tt></pre>
@@ -615,7 +616,7 @@ Junio C Hamano <junkio@cox.net></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>
|