Autogenerated HTML docs for v1.6.3.2-363-gc5764

1 files changed, 19 insertions, 3 deletions

diff --git a/git-submodule.html b/git-submodule.html
index 981e03372..0b2aabe0c 100644
--- a/git-submodule.html
+++ b/git-submodule.html
@@ -438,8 +438,9 @@ 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 unless <em>--rebase</em> is

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

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

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

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

@@ -553,6 +554,21 @@ sync
 </p>

 </dd>

 <dt>

+--merge

+</dt>

+<dd>

+<p>

+        This option is only valid for the update command.

+        Merge the commit recorded in the superproject into the current branch

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

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

+        have to resolve the resulting conflicts within the submodule with the

+        usual conflict resolution tools.

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

+        implicit.

+</p>

+</dd>

+<dt>

 --rebase

 </dt>

 <dd>

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

 <div id="footer">

 <div id="footer-text">

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

+Last updated 2009-06-21 08:03:02 UTC

 </div>

 </div>

 </body>