Autogenerated HTML docs for v2.14.0-rc0

1 files changed, 5 insertions, 7 deletions

diff --git a/git-pull.html b/git-pull.html
index ae29cac3d..5ac6cf643 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -839,13 +839,11 @@ pulling or stash them away with <a href="git-stash.html">git-stash(1)</a>.</p></
 <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.

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

+        <a href="gitmodules.html">gitmodules(5)</a>).

 </p>

+<div class="paragraph"><p>If the checkout is done via rebase, local submodule commits are rebased as well.</p></div>

+<div class="paragraph"><p>If the update is done via merge, the submodule conflicts are resolved and checked out.</p></div>

 </dd>

 </dl></div>

 <div class="sect2">

@@ -1982,7 +1980,7 @@ version.</p></div>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2017-06-30 14:49:23 PDT

+Last updated 2017-07-13 16:37:56 PDT

 </div>

 </div>

 </body>