Autogenerated HTML docs for v1.6.6.1-383-g5a9f

1 files changed, 13 insertions, 13 deletions

diff --git a/git-fetch.html b/git-fetch.html
index b55bb7054..00fdec96d 100644
--- a/git-fetch.html
+++ b/git-fetch.html
@@ -331,7 +331,7 @@ git-fetch(1) Manual Page
 along with the objects necessary to complete them.</p></div>

 <div class="para"><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>

+operation done by <em>git merge</em>.</p></div>

 <div class="para"><p>When &lt;refspec&gt; stores the fetched result in tracking branches,

 the tags that point at these branches are automatically

 followed.  This is done by first fetching from the remote using

@@ -394,7 +394,7 @@ there is a remotes.&lt;group&gt; entry in the configuration file.
 </dt>

 <dd>

 <p>

-        When <em>git-fetch</em> is used with <tt>&lt;rbranch&gt;:&lt;lbranch&gt;</tt>

+        When <em>git fetch</em> is used with <tt>&lt;rbranch&gt;:&lt;lbranch&gt;</tt>

         refspec, it refuses to update the local branch

         <tt>&lt;lbranch&gt;</tt> unless the remote branch <tt>&lt;rbranch&gt;</tt> it

         fetches is a descendant of <tt>&lt;lbranch&gt;</tt>.  This option

@@ -467,10 +467,10 @@ there is a remotes.&lt;group&gt; entry in the configuration file.
 </dt>

 <dd>

 <p>

-        By default <em>git-fetch</em> refuses to update the head which

+        By default <em>git fetch</em> refuses to update the head which

         corresponds to the current branch.  This flag disables the

-        check.  This is purely for the internal use for <em>git-pull</em>

-        to communicate with <em>git-fetch</em>, and unless you are

+        check.  This is purely for the internal use for <em>git pull</em>

+        to communicate with <em>git fetch</em>, and unless you are

         implementing your own Porcelain you are not supposed to

         use it.

 </p>

@@ -481,7 +481,7 @@ there is a remotes.&lt;group&gt; entry in the configuration file.
 <dd>

 <p>

         When given, and the repository to fetch from is handled

-        by <em>git-fetch-pack</em>, <em>--exec=&lt;upload-pack&gt;</em> is passed to

+        by <em>git fetch-pack</em>, <em>--exec=&lt;upload-pack&gt;</em> is passed to

         the command to specify non-default path for the command

         run on the other end.

 </p>

@@ -569,7 +569,7 @@ must know this is the expected usage pattern for a branch.</td>
 </td>

 <td class="content">You never do your own development on branches that appear

 on the right hand side of a &lt;refspec&gt; colon on <tt>Pull:</tt> lines;

-they are to be updated by <em>git-fetch</em>.  If you intend to do

+they are to be updated by <em>git fetch</em>.  If you intend to do

 development derived from a remote branch <tt>B</tt>, have a <tt>Pull:</tt>

 line to track it (i.e. <tt>Pull: B:remote-B</tt>), and have a separate

 branch <tt>my-B</tt> to do your development on top of it.  The latter

@@ -586,13 +586,13 @@ on the remote branch, merge it into your development branch with
 <div class="title">Note</div>

 </td>

 <td class="content">There is a difference between listing multiple &lt;refspec&gt;

-directly on <em>git-pull</em> command line and having multiple

+directly on <em>git pull</em> command line and having multiple

 <tt>Pull:</tt> &lt;refspec&gt; lines for a &lt;repository&gt; and running

-<em>git-pull</em> command without any explicit &lt;refspec&gt; parameters.

+<em>git pull</em> command without any explicit &lt;refspec&gt; parameters.

 &lt;refspec&gt; listed explicitly on the command line are always

 merged into the current branch after fetching.  In other words,

 if you list more than one remote refs, you would be making

-an Octopus.  While <em>git-pull</em> run without any explicit &lt;refspec&gt;

+an Octopus.  While <em>git pull</em> run without any explicit &lt;refspec&gt;

 parameter takes default &lt;refspec&gt;s from <tt>Pull:</tt> lines, it

 merges only the first &lt;refspec&gt; found into the current branch,

 after fetching all the remote refs.  This is because making an

@@ -808,8 +808,8 @@ following format:</p></div>
         Pull: &lt;refspec&gt;

 </tt></pre>

 </div></div>

-<div class="para"><p><tt>Push:</tt> lines are used by <em>git-push</em> and

-<tt>Pull:</tt> lines are used by <em>git-pull</em> and <em>git-fetch</em>.

+<div class="para"><p><tt>Push:</tt> lines are used by <em>git push</em> and

+<tt>Pull:</tt> lines are used by <em>git pull</em> and <em>git fetch</em>.

 Multiple <tt>Push:</tt> and <tt>Pull:</tt> lines may

 be specified for additional branch mappings.</p></div>

 <h3 id="_named_file_in_tt_git_dir_branches_tt">Named file in <tt>$GIT_DIR/branches</tt></h3><div style="clear:left"></div>

@@ -888,7 +888,7 @@ Junio C Hamano &lt;gitster@pobox.com&gt;</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2009-12-03 09:12:34 UTC

+Last updated 2010-01-21 17:44:28 UTC

 </div>

 </div>

 </body>