pull: Document the "--[no-]recurse-submodules" options
In commits be254a0ea9 and 7dce19d374 the handling of the new fetch options "--[no-]recurse-submodules" had been added to git-pull.sh. But they were not documented as the pull options they now are, so let's fix that. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jens Lehmann committed
Feb 7, 2011 at 23:24 UTC
7811d9600f02e70c9f835719c71156c967a684f7
2 files changed
+9
-2
Documentation/fetch-options.txt
-2
@@ -64,13 +64,11 @@ ifndef::git-pull[]
64
downloaded. The default behavior for a remote may be
65
specified with the remote.<name>.tagopt setting. See
66
linkgit:git-config[1].
67
-endif::git-pull[]
67
68
--[no-]recurse-submodules::
69
This option controls if new commits of all populated submodules should
70
be fetched too (see linkgit:git-config[1] and linkgit:gitmodules[5]).
71
73
-ifndef::git-pull[]
72
--submodule-prefix=<path>::
73
Prepend <path> to paths printed in informative messages
74
such as "Fetching submodule foo". This option is used
Documentation/git-pull.txt
+9
@@ -84,6 +84,15 @@ must be given before the options meant for 'git fetch'.
84
--verbose::
85
Pass --verbose to git-fetch and git-merge.
86
87
+--[no-]recurse-submodules::
88
+ This option controls if new commits of all populated submodules should
89
+ be fetched too (see linkgit:git-config[1] and linkgit:gitmodules[5]).
90
+ That might be necessary to get the data needed for merging submodule
91
+ commits, a feature git learned in 1.7.3. Notice that the result of a
92
+ merge will not be checked out in the submodule, "git submodule update"
93
+ has to be called afterwards to bring the work tree up to date with the
94
+ merge result.
95
+
96
Options related to merging
97
~~~~~~~~~~~~~~~~~~~~~~~~~~
98