summaryrefslogtreecommitdiffstats
path: root/git-remote.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2011-04-06 19:53:38 +0000
committerJunio C Hamano <junio@kernel.org>2011-04-06 19:53:38 +0000
commitee3adc3b53e659ab5059661dc8fb434d7af42958 (patch)
treed43f0c88013ae5f3a12f73b01a46248441e9ad06 /git-remote.html
parent5cd1518ba777d6d41a66941c1af682009f26138a (diff)
downloadgit-htmldocs-ee3adc3b53e659ab5059661dc8fb434d7af42958.tar.gz
Autogenerated HTML docs for v1.7.5-rc1
Diffstat (limited to 'git-remote.html')
-rw-r--r--git-remote.html16
1 files changed, 9 insertions, 7 deletions
diff --git a/git-remote.html b/git-remote.html
index 431427361..455352774 100644
--- a/git-remote.html
+++ b/git-remote.html
@@ -416,7 +416,7 @@ git-remote(1) Manual Page
<div class="sectionbody">
<div class="verseblock">
<div class="verseblock-content"><em>git remote</em> [-v | --verbose]
-<em>git remote add</em> [-t &lt;branch&gt;] [-m &lt;master&gt;] [-f] [--tags|--no-tags] [--mirror] &lt;name&gt; &lt;url&gt;
+<em>git remote add</em> [-t &lt;branch&gt;] [-m &lt;master&gt;] [-f] [--tags|--no-tags] [--mirror=&lt;fetch|push&gt;] &lt;name&gt; &lt;url&gt;
<em>git remote rename</em> &lt;old&gt; &lt;new&gt;
<em>git remote rm</em> &lt;name&gt;
<em>git remote set-head</em> &lt;name&gt; (-a | -d | &lt;branch&gt;)
@@ -478,11 +478,13 @@ is created. You can give more than one <tt>-t &lt;branch&gt;</tt> to track
multiple branches without grabbing all branches.</p></div>
<div class="paragraph"><p>With <tt>-m &lt;master&gt;</tt> option, <tt>$GIT_DIR/remotes/&lt;name&gt;/HEAD</tt> is set
up to point at remote&#8217;s <tt>&lt;master&gt;</tt> branch. See also the set-head command.</p></div>
-<div class="paragraph"><p>In mirror mode, enabled with <tt>--mirror</tt>, the refs will not be stored
-in the <em>refs/remotes/</em> namespace, but in <em>refs/heads/</em>. This option
-only makes sense in bare repositories. If a remote uses mirror
-mode, furthermore, <tt>git push</tt> will always behave as if <tt>--mirror</tt>
-was passed.</p></div>
+<div class="paragraph"><p>When a fetch mirror is created with <tt>--mirror=fetch</tt>, the refs will not
+be stored in the <em>refs/remotes/</em> namespace, but rather everything in
+<em>refs/</em> on the remote will be directly mirrored into <em>refs/</em> in the
+local repository. This option only makes sense in bare repositories,
+because a fetch would overwrite any local commits.</p></div>
+<div class="paragraph"><p>When a push mirror is created with <tt>--mirror=push</tt>, then <tt>git push</tt>
+will always behave as if <tt>--mirror</tt> was passed.</p></div>
</dd>
<dt class="hdlist1">
<em>rename</em>
@@ -657,7 +659,7 @@ $ git merge origin</tt></pre>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-03-15 23:30:14 UTC
+Last updated 2011-04-06 19:53:11 UTC
</div>
</div>
</body>