Merge branch 'tg/add-chmod+x-fix'

diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index 07cdd73ab2e68da4aaef30a523801f56610b176c..10dcc08ff9977ecd0803915aade4b58a27495bbf 100644 (file)
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -79,6 +79,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
 --------