Merge branch 'maint'

* maint:
  Document sendemail.envelopesender configuration
  Document clarification: gitmodules, gitattributes
  config.txt: Add missing colons after option name
This commit is contained in:
Junio C Hamano 2008-08-31 16:52:53 -07:00
commit 7f314565fe
4 changed files with 6 additions and 3 deletions

View File

@ -697,7 +697,7 @@ gitcvs.logfile::
Path to a log file where the CVS server interface well... logs Path to a log file where the CVS server interface well... logs
various stuff. See linkgit:git-cvsserver[1]. various stuff. See linkgit:git-cvsserver[1].
gitcvs.usecrlfattr gitcvs.usecrlfattr::
If true, the server will look up the `crlf` attribute for If true, the server will look up the `crlf` attribute for
files to determine the '-k' modes to use. If `crlf` is set, files to determine the '-k' modes to use. If `crlf` is set,
the '-k' mode will be left blank, so cvs clients will the '-k' mode will be left blank, so cvs clients will

View File

@ -179,6 +179,9 @@ user is prompted for a password while the input is masked for privacy.
This is useful if your default address is not the address that is This is useful if your default address is not the address that is
subscribed to a list. If you use the sendmail binary, you must have subscribed to a list. If you use the sendmail binary, you must have
suitable privileges for the -f parameter. suitable privileges for the -f parameter.
Default is the value of the 'sendemail.envelopesender' configuration
variable; if that is unspecified, choosing the envelope sender is left
to your MTA.
--to:: --to::
Specify the primary recipient of the emails generated. Specify the primary recipient of the emails generated.

View File

@ -7,7 +7,7 @@ gitattributes - defining attributes per path
SYNOPSIS SYNOPSIS
-------- --------
$GIT_DIR/info/attributes, gitattributes $GIT_DIR/info/attributes, .gitattributes
DESCRIPTION DESCRIPTION

View File

@ -7,7 +7,7 @@ gitmodules - defining submodule properties
SYNOPSIS SYNOPSIS
-------- --------
gitmodules $GIT_WORK_DIR/.gitmodules
DESCRIPTION DESCRIPTION