diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-16 12:57:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-16 12:57:15 -0800 |
| commit | 4bb4d30095fbc3b1689cc656e71f6a51e43fbd69 (patch) | |
| tree | 2865af7e033d5aee40cb589fe8ad8bdfa6d8b143 /Documentation/gitmodules.txt | |
| parent | b5c6aac01baf9164e08915b348490710e83119f9 (diff) | |
| parent | 1c1f3537c0283c92abbca9155813ed62b05cb481 (diff) | |
| download | git-4bb4d30095fbc3b1689cc656e71f6a51e43fbd69.tar.xz | |
Merge branch 'jl/fetch-submodule-recursive'
* jl/fetch-submodule-recursive:
fetch_populated_submodules(): document dynamic allocation
Submodules: Add the "fetchRecurseSubmodules" config option
Add the 'fetch.recurseSubmodules' config setting
fetch/pull: Add the --recurse-submodules option
Conflicts:
builtin/fetch.c
Diffstat (limited to 'Documentation/gitmodules.txt')
| -rw-r--r-- | Documentation/gitmodules.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt index bcffd95ada..6c93202e73 100644 --- a/Documentation/gitmodules.txt +++ b/Documentation/gitmodules.txt @@ -44,6 +44,14 @@ submodule.<name>.update:: This config option is overridden if 'git submodule update' is given the '--merge' or '--rebase' options. +submodule.<name>.fetchRecurseSubmodules:: + This option can be used to enable/disable recursive fetching of this + submodule. If this option is also present in the submodules entry in + .git/config of the superproject, the setting there will override the + one found in .gitmodules. + Both settings can be overriden on the command line by using the + "--[no-]recurse-submodules" option to "git fetch" and "git pull".. + submodule.<name>.ignore:: Defines under what circumstances "git status" and the diff family show a submodule as modified. When set to "all", it will never be considered |