summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-05-31 18:14:17 -0700
committerJunio C Hamano <gitster@pobox.com>2010-05-31 18:14:17 -0700
commit6774e2bf0822cd4358620d3e806f9b3df8bd777e (patch)
tree1372d1e4c440020d51dbba94ab6aa8d492eeb9a8 /Documentation/config.txt
parent811dd906dbb391544085a3a7ca6cfc7b53d33131 (diff)
parent4b2343fa4125f73a26cb20016a3ae3a27c00dd6f (diff)
downloadgit-6774e2bf0822cd4358620d3e806f9b3df8bd777e.tar.gz
Merge branch 'maint-1.7.0' into maint
* maint-1.7.0: 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 c3ebd4d07c..bcf3705759 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1681,6 +1681,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