Merge branch 'jc/cvsserver' into maint-2.10

diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index 5f50df4079a80d70086bf4a1bf2c6974f4ed5689..8f7c50f330f36f625951db7f4cc4657a31fa7113 100644 (file)
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -82,6 +82,11 @@ submodule.<name>.ignore::
        "--ignore-submodule" option. The 'git submodule' commands are not
        affected by this setting.
 
+submodule.<name>.shallow::
+       When set to true, a clone of this submodule will be performed as a
+       shallow clone unless the user explicitly asks for a non-shallow
+       clone.
+
 
 EXAMPLES
 --------