Autogenerated HTML docs for v1.7.3.2-343-g7d43d

1 files changed, 5 insertions, 5 deletions

diff --git a/git-pull.html b/git-pull.html
index 3093370d7..45d791930 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -428,7 +428,7 @@ With <tt>--rebase</tt>, it runs <em>git rebase</em> instead of <em>git merge</em
 <div class="paragraph"><p>&lt;repository&gt; should be the name of a remote repository as

 passed to <a href="git-fetch.html">git-fetch(1)</a>.  &lt;refspec&gt; can name an

 arbitrary remote ref (for example, the name of a tag) or even

-a collection of refs with corresponding remote tracking branches

+a collection of refs with corresponding remote-tracking branches

 (e.g., refs/heads/<strong>:refs/remotes/origin/</strong>), but usually it is

 the name of a branch in the remote repository.</p></div>

 <div class="paragraph"><p>Default values for &lt;repository&gt; and &lt;branch&gt; are read from the

@@ -1309,7 +1309,7 @@ of the configuration <tt>remote.&lt;origin&gt;.url</tt> is consulted
 and if there is not any such variable, the value on <tt>URL: ` line

 in `$GIT_DIR/remotes/&lt;origin&gt;</tt> file is used.</p></div>

 <div class="paragraph"><p>In order to determine what remote branches to fetch (and

-optionally store in the tracking branches) when the command is

+optionally store in the remote-tracking branches) when the command is

 run without any refspec parameters on the command line, values

 of the configuration variable <tt>remote.&lt;origin&gt;.fetch</tt> are

 consulted, and if there aren&#8217;t any, <tt>$GIT_DIR/remotes/&lt;origin&gt;</tt>

@@ -1321,9 +1321,9 @@ section, you can have a globbing refspec that looks like this:</p></div>
 <pre><tt>refs/heads/*:refs/remotes/origin/*</tt></pre>

 </div></div>

 <div class="paragraph"><p>A globbing refspec must have a non-empty RHS (i.e. must store

-what were fetched in tracking branches), and its LHS and RHS

+what were fetched in remote-tracking branches), and its LHS and RHS

 must end with <tt>/*</tt>.  The above specifies that all remote

-branches are tracked using tracking branches in

+branches are tracked using remote-tracking branches in

 <tt>refs/remotes/origin/</tt> hierarchy under the same name.</p></div>

 <div class="paragraph"><p>The rule to determine which remote branch to merge after

 fetching is a bit involved, in order not to break backward

@@ -1413,7 +1413,7 @@ Junio C Hamano and the git-list &lt;<a href="mailto:git@vger.kernel.org">git@vge
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2010-11-18 00:51:23 UTC

+Last updated 2010-11-25 03:13:42 UTC

 </div>

 </div>

 </body>