Autogenerated HTML docs for v1.7.10.2-484-gcd07c

1 files changed, 3 insertions, 5 deletions

diff --git a/git-submodule.html b/git-submodule.html
index 324ba84b7..20cecec43 100644
--- a/git-submodule.html
+++ b/git-submodule.html
@@ -725,16 +725,14 @@ update
         checkout the commit specified in the index of the containing repository.

         This will make the submodules HEAD be detached unless <tt>--rebase</tt> or

         <tt>--merge</tt> is specified or the key <tt>submodule.$name.update</tt> is set to

-        <tt>rebase</tt>, <tt>merge</tt> or <tt>none</tt>.

+        <tt>rebase</tt>, <tt>merge</tt> or <tt>none</tt>. <tt>none</tt> can be overriden by specifying

+        <tt>--checkout</tt>.

 </p>

 <div class="paragraph"><p>If the submodule is not yet initialized, and you just want to use the

 setting as stored in .gitmodules, you can automatically initialize the

 submodule with the <tt>--init</tt> option.</p></div>

 <div class="paragraph"><p>If <tt>--recursive</tt> is specified, this command will recurse into the

 registered submodules, and update any nested submodules within.</p></div>

-<div class="paragraph"><p>If the configuration key <tt>submodule.$name.update</tt> is set to <tt>none</tt> the

-submodule with name <tt>$name</tt> will not be updated by default. This can be

-overriden by adding <tt>--checkout</tt> to the command.</p></div>

 </dd>

 <dt class="hdlist1">

 summary

@@ -971,7 +969,7 @@ for details.</p></div>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2012-03-31 11:18:40 PDT

+Last updated 2012-05-11 13:03:27 PDT

 </div>

 </div>

 </body>