Autogenerated HTML docs for v1.9.0-258-g00eda

1 files changed, 16 insertions, 2 deletions

diff --git a/git-submodule.html b/git-submodule.html
index fadee5dd8..e67670cd8 100644
--- a/git-submodule.html
+++ b/git-submodule.html
@@ -756,7 +756,7 @@ git-submodule(1) Manual Page
 <em>git submodule</em> [--quiet] init [--] [&lt;path&gt;&#8230;]

 <em>git submodule</em> [--quiet] deinit [-f|--force] [--] &lt;path&gt;&#8230;

 <em>git submodule</em> [--quiet] update [--init] [--remote] [-N|--no-fetch]

-              [-f|--force] [--rebase|--merge|--checkout] [--reference &lt;repository&gt;]

+              [-f|--force] [--checkout|--rebase|--merge] [--reference &lt;repository&gt;]

               [--depth &lt;depth&gt;] [--recursive] [--] [&lt;path&gt;&#8230;]

 <em>git submodule</em> [--quiet] summary [--cached|--files] [(-n|--summary-limit) &lt;n&gt;]

               [commit] [--] [&lt;path&gt;&#8230;]

@@ -1136,6 +1136,20 @@ the submodule itself.</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

+--checkout

+</dt>

+<dd>

+<p>

+        This option is only valid for the update command.

+        Checkout the commit recorded in the superproject on a detached HEAD

+        in the submodule. This is the default behavior, the main use of

+        this option is to override <tt>submodule.$name.update</tt> when set to

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

+        If the key <tt>submodule.$name.update</tt> is either not explicitly set or

+        set to <tt>checkout</tt>, this option is implicit.

+</p>

+</dd>

+<dt class="hdlist1">

 --merge

 </dt>

 <dd>

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

 <div id="footer">

 <div id="footer-text">

-Last updated 2014-02-27 15:06:29 PST

+Last updated 2014-03-14 14:59:49 PDT

 </div>

 </div>

 </body>