summaryrefslogtreecommitdiff
path: root/Documentation/git-send-email.txt
diff options
context:
space:
mode:
authorPascal Obry <pascal@obry.net>2010-09-06 18:12:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-09-07 00:31:06 (GMT)
commit052fbea26e51121d155ccaa3b0ae6ac892cc41ea (patch)
treebf72d9921c34b59a2d3d58b5e5c3b13a15bd1f8f /Documentation/git-send-email.txt
parent1d02a0055a01478d6253c405b346297bd4217bb1 (diff)
downloadgit-052fbea26e51121d155ccaa3b0ae6ac892cc41ea.zip
git-052fbea26e51121d155ccaa3b0ae6ac892cc41ea.tar.gz
git-052fbea26e51121d155ccaa3b0ae6ac892cc41ea.tar.bz2
New send-email option smtpserveroption.
The new command line parameter --smtp-server-option or default configuration sendemail.smtpserveroption can be used to pass specific options to the SMTP server. Update the documentation accordingly. Signed-off-by: Pascal Obry <pascal@obry.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-send-email.txt')
-rw-r--r--Documentation/git-send-email.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index c283084..cde404a 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -165,6 +165,15 @@ user is prompted for a password while the input is masked for privacy.
are also accepted. The port can also be set with the
'sendemail.smtpserverport' configuration variable.
+--smtp-server-option=<option>::
+ If set, specifies the outgoing SMTP server option to use.
+ Default value can be specified by the 'sendemail.smtpserveroption'
+ configuration option.
++
+The --smtp-server-option option must be repeated for each option you want
+to pass to the server. Likewise, different lines in the configuration files
+must be used for each option.
+
--smtp-ssl::
Legacy alias for '--smtp-encryption ssl'.