path: root/Documentation/git-pull.txt
diff options
authorJens Lehmann <>2011-02-07 22:24:54 (GMT)
committerJunio C Hamano <>2011-02-07 23:19:09 (GMT)
commit7811d9600f02e70c9f835719c71156c967a684f7 (patch)
tree9c939e87bcd4abafc242c5b4960d3a969b0b3a2f /Documentation/git-pull.txt
parentcf548cacdd0c553b6524969d0d3fd5e787efeb3c (diff)
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 But they were not documented as the pull options they now are, so let's fix that. Signed-off-by: Jens Lehmann <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/git-pull.txt')
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 3046691..b33e6be 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -84,6 +84,15 @@ must be given before the options meant for 'git fetch'.
Pass --verbose to git-fetch and git-merge.
+ This option controls if new commits of all populated submodules should
+ be fetched too (see linkgit:git-config[1] and linkgit:gitmodules[5]).
+ That might be necessary to get the data needed for merging submodule
+ commits, a feature git learned in 1.7.3. Notice that the result of a
+ merge will not be checked out in the submodule, "git submodule update"
+ has to be called afterwards to bring the work tree up to date with the
+ merge result.
Options related to merging