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 | |
| parent | b5c6aac01baf9164e08915b348490710e83119f9 (diff) | |
| parent | 1c1f3537c0283c92abbca9155813ed62b05cb481 (diff) | |
| download | git-4bb4d30095fbc3b1689cc656e71f6a51e43fbd69.tar.gz 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')
| -rw-r--r-- | Documentation/config.txt | 12 | ||||
| -rw-r--r-- | Documentation/fetch-options.txt | 11 | ||||
| -rw-r--r-- | Documentation/gitmodules.txt | 8 |
3 files changed, 31 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 488a27cd0..bf9479e4e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -897,6 +897,11 @@ diff.wordRegex:: sequences that match the regular expression are "words", all other 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 sumodules unless + configured otherwise. + fetch.unpackLimit:: If the number of objects fetched over the git native transfer is below this @@ -1811,6 +1816,13 @@ submodule.<name>.update:: URL and other values found in the `.gitmodules` file. See 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 + submodule. It can be overriden 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] + file. + 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 diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index 678675ccd..695696da1 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -66,6 +66,17 @@ ifndef::git-pull[] linkgit:git-config[1]. endif::git-pull[] +--[no-]recurse-submodules:: + This option controls if new commits of all populated submodules should + be fetched too (see linkgit:git-config[1] and linkgit:gitmodules[5]). + +ifndef::git-pull[] +--submodule-prefix=<path>:: + Prepend <path> to paths printed in informative messages + such as "Fetching submodule foo". This option is used + internally when recursing over submodules. +endif::git-pull[] + -u:: --update-head-ok:: By default 'git fetch' refuses to update the head which diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt index bcffd95ad..6c93202e7 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 |