Autogenerated HTML docs for v1.7.7-213-g8b0e1

1 files changed, 7 insertions, 2 deletions

diff --git a/git-submodule.html b/git-submodule.html
index 758fcc48d..8bfcd32a4 100644
--- a/git-submodule.html
+++ b/git-submodule.html
@@ -700,6 +700,8 @@ init
 <p>

         Initialize the submodules, i.e. register each submodule name

         and url found in .gitmodules into .git/config.

+        It will also copy the value of <tt>submodule.$name.update</tt> into

+        .git/config.

         The key used in .git/config is <tt>submodule.$name.url</tt>.

         This command does not alter existing information in .git/config.

         You can then customize the submodule clone URLs in .git/config

@@ -718,13 +720,16 @@ 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> or <tt>merge</tt>.

+        <tt>rebase</tt>, <tt>merge</tt> or <tt>none</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

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

 <div id="footer">

 <div id="footer-text">

-Last updated 2011-09-21 23:01:14 PDT

+Last updated 2011-10-10 16:42:04 PDT

 </div>

 </div>

 </body>