Autogenerated HTML docs for v1.6.3.2-306-g4f4fa

1 files changed, 18 insertions, 3 deletions

diff --git a/git-submodule.html b/git-submodule.html
index 55e4dd76b..981e03372 100644
--- a/git-submodule.html
+++ b/git-submodule.html
@@ -325,7 +325,7 @@ git-submodule(1) Manual Page
               [--reference <repository>] [--] <repository> <path>

 <em>git submodule</em> [--quiet] status [--cached] [--] [&lt;path&gt;&#8230;]

 <em>git submodule</em> [--quiet] init [--] [&lt;path&gt;&#8230;]

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

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

               [--reference &lt;repository&gt;] [--] [&lt;path&gt;&#8230;]

 <em>git submodule</em> [--quiet] summary [--summary-limit &lt;n&gt;] [commit] [--] [&lt;path&gt;&#8230;]

 <em>git submodule</em> [--quiet] foreach &lt;command&gt;

@@ -438,7 +438,8 @@ update
 <p>

         Update the registered submodules, i.e. clone missing submodules and

         checkout the commit specified in the index of the containing repository.

-        This will make the submodules HEAD be detached.

+        This will make the submodules HEAD be detached unless <em>--rebase</em> is

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

 </p>

 <div class="para"><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

@@ -552,6 +553,20 @@ sync
 </p>

 </dd>

 <dt>

+--rebase

+</dt>

+<dd>

+<p>

+        This option is only valid for the update command.

+        Rebase the current branch onto the commit recorded in the

+        superproject. If this option is given, the submodule's HEAD will not

+        be detached. If a a merge failure prevents this process, you will have

+        to resolve these failures with <a href="git-rebase.html">git-rebase(1)</a>.

+        If the key <tt>submodule.$name.update</tt> is set to <tt>rebase</tt>, this option is

+        implicit.

+</p>

+</dd>

+<dt>

 --reference &lt;repository&gt;

 </dt>

 <dd>

@@ -593,7 +608,7 @@ for details.</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2009-05-23 09:53:16 UTC

+Last updated 2009-06-14 01:03:02 UTC

 </div>

 </div>

 </body>