summaryrefslogtreecommitdiffstats
path: root/git-pull.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-04-29 14:21:05 -0700
committerJunio C Hamano <gitster@pobox.com>2020-04-29 14:21:05 -0700
commit0dd50943c112dfc70367bd39eb3c88371db2518f (patch)
treef60fdfeafd48ad1b7c65220f044086e476422ecb /git-pull.txt
parent67bf224a9fb3cd34ef712113c48f3144a9bc232a (diff)
downloadgit-htmldocs-0dd50943c112dfc70367bd39eb3c88371db2518f.tar.gz
Autogenerated HTML docs for v2.26.2-357-g86ab1
Diffstat (limited to 'git-pull.txt')
-rw-r--r--git-pull.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/git-pull.txt b/git-pull.txt
index 21e10905f..9c7ab2d48 100644
--- a/git-pull.txt
+++ b/git-pull.txt
@@ -85,8 +85,9 @@ OPTIONS
Pass --verbose to git-fetch and git-merge.
--[no-]recurse-submodules[=yes|on-demand|no]::
- 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
linkgit:gitmodules[5]).
+
If the checkout is done via rebase, local submodule commits are rebased as well.