Merge branch 'kb/diff-C-M-synonym'

diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 5ce1e727458bfa5e73ad98c7a852bd7c0f034c6b..695696da1b6e78639014388e1d4ac8bf09a0e12d 100644 (file)
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -36,7 +36,7 @@ ifndef::git-pull[]
 
 -p::
 --prune::
-       After fetching, remove any remote tracking branches which
+       After fetching, remove any remote-tracking branches which
        no longer exist on the remote.
 endif::git-pull[]
 
@@ -66,6 +66,17 @@ ifndef::git-pull[]
        linkgit:git-config[1].
 endif::git-pull[]
 
+--[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]).
+
+ifndef::git-pull[]
+--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::
 --update-head-ok::
        By default 'git fetch' refuses to update the head which