diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-04-28 22:50:01 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-04-28 22:50:01 (GMT) |
commit | cc908dbc76adea39b2756c1091016e929c66689d (patch) | |
tree | e5f6b26d135a41a8721ad91ee06252e29e9e7bdd /Documentation/config | |
parent | 9404128b34bc1abfc99b20f2ce4ca14a2828d7a0 (diff) | |
parent | acbfae32a31180d781357028af9aff8928672d4b (diff) | |
download | git-cc908dbc76adea39b2756c1091016e929c66689d.zip git-cc908dbc76adea39b2756c1091016e929c66689d.tar.gz git-cc908dbc76adea39b2756c1091016e929c66689d.tar.bz2 |
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/config')
-rw-r--r-- | Documentation/config/fetch.txt | 13 | ||||
-rw-r--r-- | Documentation/config/push.txt | 2 | ||||
-rw-r--r-- | Documentation/config/submodule.txt | 12 |
3 files changed, 20 insertions, 7 deletions
diff --git a/Documentation/config/fetch.txt b/Documentation/config/fetch.txt index f119402..b1a9b14 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 diff --git a/Documentation/config/push.txt b/Documentation/config/push.txt index 0a7aa32..f5e5b38 100644 --- a/Documentation/config/push.txt +++ b/Documentation/config/push.txt @@ -112,3 +112,5 @@ push.recurseSubmodules:: is 'no' then default behavior of ignoring submodules when pushing is retained. You may override this configuration at time of push by specifying '--recurse-submodules=check|on-demand|no'. + If not set, 'no' is used by default, unless 'submodule.recurse' is + set (in which case a 'true' value means 'on-demand'). diff --git a/Documentation/config/submodule.txt b/Documentation/config/submodule.txt index b331771..d7a63c8 100644 --- a/Documentation/config/submodule.txt +++ b/Documentation/config/submodule.txt @@ -59,9 +59,17 @@ submodule.active:: submodule.recurse:: Specifies if commands recurse into submodules by default. This - applies to all commands that have a `--recurse-submodules` option, - except `clone`. + applies to all commands that have a `--recurse-submodules` option + (`checkout`, `fetch`, `grep`, `pull`, `push`, `read-tree`, `reset`, + `restore` and `switch`) except `clone` and `ls-files`. Defaults to false. + When set to true, it can be deactivated via the + `--no-recurse-submodules` option. Note that some Git commands + lacking this option may call some of the above commands affected by + `submodule.recurse`; for instance `git remote update` will call + `git fetch` but does not have a `--no-recurse-submodules` option. + For these commands a workaround is to temporarily change the + configuration value by using `git -c submodule.recurse=0`. submodule.fetchJobs:: Specifies how many submodules are fetched/cloned at the same time. |