summaryrefslogtreecommitdiff
path: root/Documentation/git-send-email.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-06-16 16:20:06 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-06-16 16:20:06 -0700
commit419ff2c575b96555dedac8c736025acfca9f982f (patch)
tree0a268d0efad1179a51711fbb361dbea124870db3 /Documentation/git-send-email.txt
parentMerge branch 'rc/maint-curl-helper' into maint (diff)
parentsend-email: Cleanup smtp-domain and add config (diff)
downloadtgif-419ff2c575b96555dedac8c736025acfca9f982f.tar.xz
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/git-send-email.txt')
-rw-r--r--Documentation/git-send-email.txt7
1 files changed, 7 insertions, 0 deletions
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