diff options
| author | Pascal Obry <pascal@obry.net> | 2010-09-06 20:12:11 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-06 17:31:06 -0700 |
| commit | 052fbea26e51121d155ccaa3b0ae6ac892cc41ea (patch) | |
| tree | bf72d9921c34b59a2d3d58b5e5c3b13a15bd1f8f /Documentation | |
| parent | 1d02a0055a01478d6253c405b346297bd4217bb1 (diff) | |
| download | git-052fbea26e51121d155ccaa3b0ae6ac892cc41ea.tar.gz | |
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')
| -rw-r--r-- | Documentation/config.txt | 1 | ||||
| -rw-r--r-- | Documentation/git-send-email.txt | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index cda6721013..bb8db24c6f 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1717,6 +1717,7 @@ sendemail.to:: sendemail.smtpdomain:: sendemail.smtpserver:: sendemail.smtpserverport:: +sendemail.smtpserveroption:: sendemail.smtpuser:: sendemail.thread:: sendemail.validate:: diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index c283084272..cde404a461 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'. |