Merge branch 'fk/maint-cvsimport-early-failure' into maint

diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 678675ccdf06dbe0e97d80bb3fbc8985155d2fc0..f37276e5add75583fd363af2cd0b7ba051771a97 100644 (file)
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -64,6 +64,15 @@ ifndef::git-pull[]
        downloaded. The default behavior for a remote may be
        specified with the remote.<name>.tagopt setting. See
        linkgit:git-config[1].
+
+--[no-]recurse-submodules::
+       This option controls if new commits of all populated submodules should
+       be fetched too (see linkgit:git-config[1] and linkgit:gitmodules[5]).
+
+--submodule-prefix=<path>::
+       Prepend <path> to paths printed in informative messages
+       such as "Fetching submodule foo".  This option is used
+       internally when recursing over submodules.
 endif::git-pull[]
 
 -u::