Merge branch 'dd/iso-8601-updates'

[thirdparty/git.git] / Documentation / fetch-options.txt

diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 00d03ec8c31ab2fd05d58248c5d811167309d780..6e2a160a47cb8c07a72600d2fc7ad404bf2bc1c1 100644 (file)
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -163,7 +163,8 @@ ifndef::git-pull[]
        value. Use 'on-demand' to only recurse into a populated submodule
        when the superproject retrieves a commit that updates the submodule's
        reference to a commit that isn't already in the local submodule
-       clone.
+       clone. By default, 'on-demand' is used, unless
+       `fetch.recurseSubmodules` is set (see linkgit:git-config[1]).
 endif::git-pull[]
 
 -j::
@@ -204,7 +205,6 @@ ifndef::git-pull[]
        recursion (such as settings in linkgit:gitmodules[5] and
        linkgit:git-config[1]) override this option, as does
        specifying --[no-]recurse-submodules directly.
-endif::git-pull[]
 
 -u::
 --update-head-ok::
@@ -214,6 +214,7 @@ endif::git-pull[]
        to communicate with 'git fetch', and unless you are
        implementing your own Porcelain you are not supposed to
        use it.
+endif::git-pull[]
 
 --upload-pack <upload-pack>::
        When given, and the repository to fetch from is handled