Autogenerated HTML docs for v1.6.1.2-306-gc0f6f

1 files changed, 5 insertions, 6 deletions

diff --git a/git-pull.html b/git-pull.html
index 933a0bfb7..15299f5e8 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -660,15 +660,14 @@ unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</td>
 </dt>

 <dd>

 <p>

-        The canonical format of a &lt;refspec&gt; parameter is

-        <tt>+?&lt;src&gt;:&lt;dst&gt;</tt>; that is, an optional plus <tt>&#43;</tt>, followed

-        by the source ref, followed by a colon <tt>:</tt>, followed by

-        the destination ref.

+        The format of a &lt;refspec&gt; parameter is an optional plus

+        <tt>&#43;</tt>, followed by the source ref &lt;src&gt;, followed

+        by a colon <tt>:</tt>, followed by the destination ref &lt;dst&gt;.

 </p>

 <div class="para"><p>The remote ref that matches &lt;src&gt;

 is fetched, and if &lt;dst&gt; is not empty string, the local

 ref that matches it is fast forwarded using &lt;src&gt;.

-Again, if the optional plus <tt>+</tt> is used, the local ref

+If the optional plus <tt>+</tt> is used, the local ref

 is updated even if it does not result in a fast forward

 update.</p></div>

 <div class="admonitionblock">

@@ -1177,7 +1176,7 @@ Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2008-12-10 08:33:22 UTC

+Last updated 2009-02-01 06:35:53 UTC

 </div>

 </div>

 </body>