Autogenerated HTML docs for v1.7.10.2-484-gcd07c

1 files changed, 8 insertions, 3 deletions

diff --git a/gitmodules.html b/gitmodules.html
index cb85e447a..e9d391235 100644
--- a/gitmodules.html
+++ b/gitmodules.html
@@ -627,9 +627,14 @@ submodule.<name>.update
         the commit specified in the superproject. If <em>merge</em>, the commit

         specified in the superproject will be merged into the current branch

         in the submodule.

-        This config option is overridden if <em>git submodule update</em> is given

-        the <em>--merge</em> or <em>--rebase</em> options.

+        If <em>none</em>, the submodule with name <tt>$name</tt> will not be updated

+        by default.

 </p>

+<div class="literalblock">

+<div class="content">

+<pre><tt>This config option is overridden if 'git submodule update' is given

+the '--merge', '--rebase' or '--checkout' options.</tt></pre>

+</div></div>

 </dd>

 <dt class="hdlist1">

 submodule.&lt;name&gt;.fetchRecurseSubmodules

@@ -697,7 +702,7 @@ submodules a URL is specified which can be used for cloning the submodules.</p><
 <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>