summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-16 23:20:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-16 23:20:06 (GMT)
commit419ff2c575b96555dedac8c736025acfca9f982f (patch)
tree0a268d0efad1179a51711fbb361dbea124870db3 /Documentation/config.txt
parent4dd4a09eac9ecb27f051ad0f3447c205c5b50c8b (diff)
parent69cf7bfd131ae6246931459a1e6513d51f0b0119 (diff)
downloadgit-419ff2c575b96555dedac8c736025acfca9f982f.zip
git-419ff2c575b96555dedac8c736025acfca9f982f.tar.gz
git-419ff2c575b96555dedac8c736025acfca9f982f.tar.bz2
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/config.txt')
-rw-r--r--Documentation/config.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index bcf3705..fc4037a 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::