From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 8 Aug 2016 21:48:44 +0000 (-0700)
Subject: Merge branch 'sb/submodule-recommend-shallowness'
X-Git-Tag: v2.10.0-rc0~32
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/dc7e09a3e0b1a06348a0b59da71ceefe08489e77?ds=inline;hp=-c

Merge branch 'sb/submodule-recommend-shallowness'

Doc update.

* sb/submodule-recommend-shallowness:
gitmodules: document shallow recommendation
---

dc7e09a3e0b1a06348a0b59da71ceefe08489e77
diff --combined Documentation/gitmodules.txt
index 07cdd73ab2,b97b331ad5..0849d281bb
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@@ -19,7 -19,7 +19,7 @@@ of linkgit:git-config[1]
  
  The file contains one subsection per submodule, and the subsection value
  is the name of the submodule. The name is set to the path where the
 -submodule has been added unless it was customized with the '--name'
 +submodule has been added unless it was customized with the `--name`
  option of 'git submodule add'. Each submodule section also contains the
  following required keys:
  
@@@ -79,6 -79,11 +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 explicitely asks for a non-shallow
+ 	clone.
+ 
  
  EXAMPLES
  --------