summaryrefslogtreecommitdiffstats
path: root/git-fetch.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-11-25 03:16:07 +0000
committerJunio C Hamano <junio@kernel.org>2010-11-25 03:16:07 +0000
commit97bcb48c6f2fa3ff8c49372fb6057ebd66b78537 (patch)
tree24f01a439c32da8e521ee57f3a738e99f3f86e0d /git-fetch.html
parent982eb11dc5ca975628029adef95a96309ae25294 (diff)
downloadgit-htmldocs-97bcb48c6f2fa3ff8c49372fb6057ebd66b78537.tar.gz
Autogenerated HTML docs for v1.7.3.2-343-g7d43d
Diffstat (limited to 'git-fetch.html')
-rw-r--r--git-fetch.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-fetch.html b/git-fetch.html
index 1ab64a4b8..34680a661 100644
--- a/git-fetch.html
+++ b/git-fetch.html
@@ -426,7 +426,7 @@ along with the objects necessary to complete them.</p></div>
<div class="paragraph"><p>The ref names and their object names of fetched refs are stored
in <tt>.git/FETCH_HEAD</tt>. This information is left for a later merge
operation done by <em>git merge</em>.</p></div>
-<div class="paragraph"><p>When &lt;refspec&gt; stores the fetched result in tracking branches,
+<div class="paragraph"><p>When &lt;refspec&gt; stores the fetched result in remote-tracking branches,
the tags that point at these branches are automatically
followed. This is done by first fetching from the remote using
the given &lt;refspec&gt;s, and if the repository has objects that are
@@ -523,7 +523,7 @@ there is a remotes.&lt;group&gt; entry in the configuration file.
</dt>
<dd>
<p>
- After fetching, remove any remote tracking branches which
+ After fetching, remove any remote-tracking branches which
no longer exist on the remote.
</p>
</dd>
@@ -994,7 +994,7 @@ Junio C Hamano &lt;<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>&gt;<
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-11-06 00:41:57 UTC
+Last updated 2010-11-25 03:13:41 UTC
</div>
</div>
</body>