Autogenerated HTML docs for v1.7.1-rc1-12-ga601

1 files changed, 13 insertions, 13 deletions

diff --git a/git-pull.html b/git-pull.html
index b4500dde0..3059009a8 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -474,6 +474,18 @@ option can be used to override --squash.</p></div>
 </p>

 </dd>

 <dt>

+-X &lt;option&gt;

+</dt>

+<dt>

+--strategy-option=&lt;option&gt;

+</dt>

+<dd>

+<p>

+        Pass merge strategy specific option through to the merge

+        strategy.

+</p>

+</dd>

+<dt>

 --summary

 </dt>

 <dt>

@@ -507,18 +519,6 @@ option can be used to override --squash.</p></div>
         Be verbose.

 </p>

 </dd>

-<dt>

--X &lt;option&gt;

-</dt>

-<dt>

---strategy-option=&lt;option&gt;

-</dt>

-<dd>

-<p>

-        Pass merge strategy specific option through to the merge

-        strategy.

-</p>

-</dd>

 </dl></div>

 <div class="vlist"><dl>

 <dt>

@@ -1214,7 +1214,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 2010-03-22 01:47:15 UTC

+Last updated 2010-04-14 14:07:15 UTC

 </div>

 </div>

 </body>