path: root/Documentation/git-pull.txt
diff options
authorJunio C Hamano <>2020-04-28 22:50:01 (GMT)
committerJunio C Hamano <>2020-04-28 22:50:01 (GMT)
commitcc908dbc76adea39b2756c1091016e929c66689d (patch)
treee5f6b26d135a41a8721ad91ee06252e29e9e7bdd /Documentation/git-pull.txt
parent9404128b34bc1abfc99b20f2ce4ca14a2828d7a0 (diff)
parentacbfae32a31180d781357028af9aff8928672d4b (diff)
Merge branch 'dr/doc-recurse-submodules'
Documentation updates around the "--recurse-submodules" option. * dr/doc-recurse-submodules: doc: --recurse-submodules mostly applies to active submodules doc: be more precise on (fetch|push).recurseSubmodules doc: explain how to deactivate submodule.recurse completely doc: document --recurse-submodules for reset and restore doc: list all commands affected by submodule.recurse
Diffstat (limited to 'Documentation/git-pull.txt')
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index 21e1090..9c7ab2d 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -85,8 +85,9 @@ OPTIONS
Pass --verbose to git-fetch and git-merge.
- This option controls if new commits of all populated submodules should
- be fetched and updated, too (see linkgit:git-config[1] and
+ This option controls if new commits of populated submodules should
+ be fetched, and if the working trees of active submodules should be
+ updated, too (see linkgit:git-fetch[1], linkgit:git-config[1] and
If the checkout is done via rebase, local submodule commits are rebased as well.