Autogenerated HTML docs for v1.7.4-15-g7811

1 files changed, 15 insertions, 10 deletions

diff --git a/git-pull.html b/git-pull.html
index 5f018820a..f94b2ac11 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -493,6 +493,20 @@ must be given before the options meant for <em>git fetch</em>.</p></div>
         Pass --verbose to git-fetch and git-merge.

 </p>

 </dd>

+<dt class="hdlist1">

+--[no-]recurse-submodules

+</dt>

+<dd>

+<p>

+        This option controls if new commits of all populated submodules should

+        be fetched too (see <a href="git-config.html">git-config(1)</a> and <a href="gitmodules.html">gitmodules(5)</a>).

+        That might be necessary to get the data needed for merging submodule

+        commits, a feature git learned in 1.7.3. Notice that the result of a

+        merge will not be checked out in the submodule, "git submodule update"

+        has to be called afterwards to bring the work tree up to date with the

+        merge result.

+</p>

+</dd>

 </dl></div>

 <h3 id="_options_related_to_merging">Options related to merging</h3><div style="clear:left"></div>

 <div class="dlist"><dl>

@@ -758,15 +772,6 @@ unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</td>
 </p>

 </dd>

 <dt class="hdlist1">

---[no-]recurse-submodules

-</dt>

-<dd>

-<p>

-        This option controls if new commits of all populated submodules should

-        be fetched too (see <a href="git-config.html">git-config(1)</a> and <a href="gitmodules.html">gitmodules(5)</a>).

-</p>

-</dd>

-<dt class="hdlist1">

 -u

 </dt>

 <dt class="hdlist1">

@@ -1423,7 +1428,7 @@ Junio C Hamano and the git-list &lt;<a href="mailto:git@vger.kernel.org">git@vge
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2010-12-13 08:31:26 UTC

+Last updated 2011-02-08 00:49:11 UTC

 </div>

 </div>

 </body>