diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-04-04 15:02:01 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-04-04 15:02:01 -0700 |
commit | 2071fb015bc673d2514142d7614b56a37b3faaf2 (patch) | |
tree | 8bd133ee781324212c8ebc395178d20707082ae2 /Documentation/config.txt | |
parent | Merge branch 'jc/rev-list-options-fix' (diff) | |
parent | fetch/pull: Describe --recurse-submodule restrictions in the BUGS section (diff) | |
download | tgif-2071fb015bc673d2514142d7614b56a37b3faaf2.tar.xz |
Merge branch 'jl/submodule-fetch-on-demand'
* jl/submodule-fetch-on-demand:
fetch/pull: Describe --recurse-submodule restrictions in the BUGS section
submodule update: Don't fetch when the submodule commit is already present
fetch/pull: Don't recurse into a submodule when commits are already present
Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option
config: teach the fetch.recurseSubmodules option the 'on-demand' value
fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
fetch/pull: recurse into submodules when necessary
Conflicts:
builtin/fetch.c
submodule.c
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r-- | Documentation/config.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 1d0d1b7677..6d4dfa602e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -897,9 +897,13 @@ diff.wordRegex:: characters are *ignorable* whitespace. fetch.recurseSubmodules:: - A boolean value which changes the behavior for fetch and pull, the - default is to not recursively fetch populated submodules unless - configured otherwise. + This option can be either set 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 + reference. fetch.unpackLimit:: If the number of objects fetched over the git native @@ -1823,7 +1827,7 @@ submodule.<name>.update:: linkgit:git-submodule[1] and linkgit:gitmodules[5] for details. submodule.<name>.fetchRecurseSubmodules:: - This option can be used to enable/disable recursive fetching of this + This option can be used to control recursive fetching of this submodule. It can be overridden by using the --[no-]recurse-submodules command line option to "git fetch" and "git pull". This setting will override that from in the linkgit:gitmodules[5] |