diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-05-09 05:37:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-09 05:37:34 (GMT) |
| commit | daa81c4a4a48a76e542293c025972e6a870fec9b (patch) | |
| tree | 66ae06b7eaddd47f1d045eafdbcb04f01eee6c2a /Documentation | |
| parent | 909376a1c9078b7bb7b420113efa956b130e8809 (diff) | |
| parent | 69cf7bfd131ae6246931459a1e6513d51f0b0119 (diff) | |
| download | git-daa81c4a4a48a76e542293c025972e6a870fec9b.zip git-daa81c4a4a48a76e542293c025972e6a870fec9b.tar.gz git-daa81c4a4a48a76e542293c025972e6a870fec9b.tar.bz2 | |
Merge branch 'bg/send-email-smtpdomain'
* bg/send-email-smtpdomain:
send-email: Cleanup smtp-domain and add config
Document send-email --smtp-domain
send-email: Don't use FQDNs without a '.'
send-email: Cleanup { style
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 1 | ||||
| -rw-r--r-- | Documentation/git-send-email.txt | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index ced5db6..e5aa2ca 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1651,6 +1651,7 @@ sendemail.smtppass:: sendemail.suppresscc:: sendemail.suppressfrom:: sendemail.to:: +sendemail.smtpdomain:: sendemail.smtpserver:: sendemail.smtpserverport:: sendemail.smtpuser:: diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index 3dfdc7c..12622fc 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -119,6 +119,13 @@ Sending value reverts to plain SMTP. Default is the value of 'sendemail.smtpencryption'. +--smtp-domain=<FQDN>:: + Specifies the Fully Qualified Domain Name (FQDN) used in the + HELO/EHLO command to the SMTP server. Some servers require the + FQDN to match your IP address. If not set, git send-email attempts + to determine your FQDN automatically. Default is the value of + 'sendemail.smtpdomain'. + --smtp-pass[=<password>]:: Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as |