diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-01 16:22:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-01 16:22:25 -0700 |
| commit | 74c3664186d04ce07591451e1b378eee966b936b (patch) | |
| tree | 02ca32f387a6dd858737e7a416ac126ea38b9c9b /Documentation | |
| parent | 48c12d4b9b5a3cd033e6e8acbd38ffd5e6b13797 (diff) | |
| parent | fa835cd5728411bfd8f851e7327e11ad809a59d1 (diff) | |
| download | git-74c3664186d04ce07591451e1b378eee966b936b.tar.gz git-74c3664186d04ce07591451e1b378eee966b936b.tar.xz | |
Merge branch 'tr/send-email-ssl'
* tr/send-email-ssl:
git-send-email: prevent undefined variable warnings if no encryption is set
git-send-email: add support for TLS via Net::SMTP::SSL
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-send-email.txt | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index 251d661af..dc7eb7bd4 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -133,10 +133,13 @@ or on the command line. If a username has been specified (with specified (with --smtp-pass or a configuration variable), then the user is prompted for a password while the input is masked for privacy. +--smtp-encryption:: + Specify the encryption to use, either 'ssl' or 'tls'. Any other + value reverts to plain SMTP. Default is the value of + 'sendemail.smtpencryption'. + --smtp-ssl:: - If set, connects to the SMTP server using SSL. - Default is the value of the 'sendemail.smtpssl' configuration value; - if that is unspecified, does not use SSL. + Legacy alias for '--smtp-encryption=ssl'. --subject:: Specify the initial subject of the email thread. @@ -229,8 +232,13 @@ sendemail.smtpuser:: sendemail.smtppass:: Default SMTP-AUTH password. +sendemail.smtpencryption:: + Default encryption method. Use 'ssl' for SSL (and specify an + appropriate port), or 'tls' for TLS. Takes precedence over + 'smtpssl' if both are specified. + sendemail.smtpssl:: - Boolean value specifying the default to the '--smtp-ssl' parameter. + Legacy boolean that sets 'smtpencryption=ssl' if enabled. Author ------ |