Merge branch 'tr/merge-unborn-clobber'

diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 470ac31396606a18298f69329b050a86943c580c..f37276e5add75583fd363af2cd0b7ba051771a97 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[]
 
@@ -53,6 +53,7 @@ endif::git-pull[]
        behavior for a remote may be specified with the remote.<name>.tagopt
        setting. See linkgit:git-config[1].
 
+ifndef::git-pull[]
 -t::
 --tags::
        Most of the tags are fetched automatically as branch
@@ -64,6 +65,16 @@ endif::git-pull[]
        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::
 --update-head-ok::
        By default 'git fetch' refuses to update the head which