summaryrefslogtreecommitdiff
path: root/Documentation/config/fetch.txt
diff options
context:
space:
mode:
authorLibravatar Damien Robert <damien.olivier.robert@gmail.com>2020-04-06 15:57:08 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-04-06 13:42:43 -0700
commit4da9e99e6eaab24ef86c44642b0692669adacfeb (patch)
treebe9d1718b599a79fe373570523926471e1102f94 /Documentation/config/fetch.txt
parentdoc: explain how to deactivate submodule.recurse completely (diff)
downloadtgif-4da9e99e6eaab24ef86c44642b0692669adacfeb.tar.xz
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/config/fetch.txt')
-rw-r--r--Documentation/config/fetch.txt13
1 files changed, 8 insertions, 5 deletions
diff --git a/Documentation/config/fetch.txt b/Documentation/config/fetch.txt
index f11940280f..b1a9b1461d 100644
--- a/Documentation/config/fetch.txt
+++ b/Documentation/config/fetch.txt
@@ -1,11 +1,14 @@
fetch.recurseSubmodules::
- This option can be either set to a boolean value or to 'on-demand'.
+ This option controls whether `git fetch` (and the underlying fetch
+ in `git pull`) will recursively fetch into populated submodules.
+ This option can be set either to a boolean value or to 'on-demand'.
Setting it to a boolean changes the behavior of fetch and pull to
- unconditionally recurse into submodules when set to true or to not
- recurse at all when set to false. When set to 'on-demand' (the default
- value), fetch and pull will only recurse into a populated submodule
- when its superproject retrieves a commit that updates the submodule's
+ recurse unconditionally into submodules when set to true or to not
+ recurse at all when set to false. When set to 'on-demand', fetch and
+ pull will only recurse into a populated submodule when its
+ superproject retrieves a commit that updates the submodule's
reference.
+ Defaults to 'on-demand', or to the value of 'submodule.recurse' if set.
fetch.fsckObjects::
If it is set to true, git-fetch-pack will check all fetched