summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-01 01:14:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-01 01:14:23 (GMT)
commit225c93a3cac93e8c619e5c8af47d2a781eedcacd (patch)
treeeaa20557ddebf80efb8de3cdb566f0fb19b45f39
parent81fa024cd8e336ba257f13fe7724b95baacfa3ad (diff)
parent6774e2bf0822cd4358620d3e806f9b3df8bd777e (diff)
downloadgit-225c93a3cac93e8c619e5c8af47d2a781eedcacd.zip
git-225c93a3cac93e8c619e5c8af47d2a781eedcacd.tar.gz
git-225c93a3cac93e8c619e5c8af47d2a781eedcacd.tar.bz2
Merge branch 'maint'
* maint: Documentation/SubmittingPatches: Fix typo in GMail section Documentation/config: describe status.submodulesummary
-rw-r--r--Documentation/SubmittingPatches2
-rw-r--r--Documentation/config.txt7
2 files changed, 8 insertions, 1 deletions
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index b9204c7..eb53e06 100644
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -547,7 +547,7 @@ Gmail
GMail does not appear to have any way to turn off line wrapping in the web
interface, so this will mangle any emails that you send. You can however
-use "git send e-mail" and send your patches through the GMail SMTP server, or
+use "git send-email" and send your patches through the GMail SMTP server, or
use any IMAP email client to connect to the google IMAP server and forward
the emails through that.
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 87f397e..85f763c 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