diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-17 03:20:06 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-17 03:20:06 +0400 |
| commit | 419ff2c575b96555dedac8c736025acfca9f982f (patch) | |
| tree | 0a268d0efad1179a51711fbb361dbea124870db3 /Documentation | |
| parent | 4dd4a09eac9ecb27f051ad0f3447c205c5b50c8b (diff) | |
| parent | 69cf7bfd131ae6246931459a1e6513d51f0b0119 (diff) | |
Merge branch 'bg/send-email-smtpdomain' into maint
* 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 bcf3705759..fc4037a7d8 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1642,6 +1642,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 3dfdc7cca6..12622fc49a 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 |