summaryrefslogtreecommitdiff
path: root/Documentation/fetch-options.txt
diff options
context:
space:
mode:
authorDamien Robert <damien.olivier.robert@gmail.com>2020-04-06 13:57:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-04-06 20:42:43 (GMT)
commit4da9e99e6eaab24ef86c44642b0692669adacfeb (patch)
treebe9d1718b599a79fe373570523926471e1102f94 /Documentation/fetch-options.txt
parentd09bc51428274bbb03669e4fb33f74b4edbe40dd (diff)
downloadgit-4da9e99e6eaab24ef86c44642b0692669adacfeb.zip
git-4da9e99e6eaab24ef86c44642b0692669adacfeb.tar.gz
git-4da9e99e6eaab24ef86c44642b0692669adacfeb.tar.bz2
doc: be more precise on (fetch|push).recurseSubmodules
The default value also depends on the value of submodule.recurse. Use this opportunity to correct some grammar mistakes in Documentation/config/fetch.txt signaled by Robert P. J. Day. Also mention `fetch.recurseSubmodules` in fetch-options.txt. In git-push.txt, `push.recurseSubmodules` is implicitly mentioned (by explaining how to disable it), so no need to add it there. Lastly add a link to `git-fetch` in `git-pull.txt` to explain the meaning of `--recurse-submodules` there. Signed-off-by: Damien Robert <damien.olivier.robert+git@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/fetch-options.txt')
-rw-r--r--Documentation/fetch-options.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 00d03ec..833f935 100644
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -163,7 +163,8 @@ ifndef::git-pull[]
value. Use 'on-demand' to only recurse into a populated submodule
when the superproject retrieves a commit that updates the submodule's
reference to a commit that isn't already in the local submodule
- clone.
+ clone. By default, 'on-demand' is used, unless
+ `fetch.recurseSubmodules` is set (see linkgit:git-config[1]).
endif::git-pull[]
-j::