summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-05-31 18:14:23 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-05-31 18:14:23 -0700
commit225c93a3cac93e8c619e5c8af47d2a781eedcacd (patch)
treeeaa20557ddebf80efb8de3cdb566f0fb19b45f39 /Documentation/config.txt
parentMerge branch 'maint' (diff)
parentMerge branch 'maint-1.7.0' into maint (diff)
downloadtgif-225c93a3cac93e8c619e5c8af47d2a781eedcacd.tar.xz
Merge branch 'maint'
* maint: Documentation/SubmittingPatches: Fix typo in GMail section Documentation/config: describe status.submodulesummary
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 87f397ed96..85f763c4d0 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1699,6 +1699,13 @@ If this variable is not specified, it defaults to 'normal'.
This variable can be overridden with the -u|--untracked-files option
of linkgit:git-status[1] and linkgit:git-commit[1].
+status.submodulesummary::
+ Defaults to false.
+ If this is set to a non zero number or true (identical to -1 or an
+ unlimited number), the submodule summary will be enabled and a
+ summary of commits for modified submodules will be shown (see
+ --summary-limit option of linkgit:git-submodule[1]).
+
tar.umask::
This variable can be used to restrict the permission bits of
tar archive entries. The default is 0002, which turns off the