mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  Documentation/SubmittingPatches: Fix typo in GMail section
  Documentation/config: describe status.submodulesummary
This commit is contained in:
Junio C Hamano
2010-05-31 18:14:23 -07:00
parent 81fa024cd8 6774e2bf08
commit 225c93a3ca
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/SubmittingPatches
View File

@ -547,7 +547,7 @@ Gmail
GMail does not appear to have any way to turn off line wrapping in the web 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 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 use any IMAP email client to connect to the google IMAP server and forward
the emails through that. the emails through that.

7
Documentation/config.txt
View File

@ -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 This variable can be overridden with the -u|--untracked-files option
of linkgit:git-status[1] and linkgit:git-commit[1]. 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:: tar.umask::
This variable can be used to restrict the permission bits of This variable can be used to restrict the permission bits of
tar archive entries. The default is 0002, which turns off the tar archive entries. The default is 0002, which turns off the