summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorLibravatar Jens Lehmann <Jens.Lehmann@web.de>2011-03-06 23:11:48 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-03-09 13:10:35 -0800
commit1fb2550202d6f88d90121624c1fac0b81ff8c33f (patch)
tree8c0ec680547c297a8cc9bf9a6f8313c89d3d0eec /Documentation/config.txt
parentfetch/pull: Add the 'on-demand' value to the --recurse-submodules option (diff)
downloadtgif-1fb2550202d6f88d90121624c1fac0b81ff8c33f.tar.xz
config: teach the fetch.recurseSubmodules option the 'on-demand' value
To enable the user to change the default behavior of "git fetch" and "git pull" regarding submodule recursion add the new "on-demand" value which has just been added to the "--recurse-submodules" command line option. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt10
1 files changed, 7 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index c5e183516a..75b1d32282 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -900,9 +900,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