diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-22 11:24:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-22 11:24:17 -0700 |
| commit | 07b83b5d98a8b7230f3ebafeb4ecf2916c011db9 (patch) | |
| tree | 0d513f8a8eeb94188c4a19876f0c5acbee2cf8c3 /Documentation | |
| parent | e683889b75a32b8c2bf11c8fa0cf851087bc5415 (diff) | |
| parent | 35035bbf074d1a4c59cd5f99282c12197105da08 (diff) | |
| download | git-07b83b5d98a8b7230f3ebafeb4ecf2916c011db9.tar.gz git-07b83b5d98a8b7230f3ebafeb4ecf2916c011db9.tar.xz | |
Merge branch 'rr/send-email-ssl-verify'
Newer Net::SMTP::SSL module does not want the user programs to use
the default behaviour to let server certificate go without
verification, so by default enable the verification with a
mechanism to turn it off if needed.
* rr/send-email-ssl-verify:
send-email: be explicit with SSL certificate verification
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 4 | ||||
| -rw-r--r-- | Documentation/git-send-email.txt | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 50067ee15..e0b923f42 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2073,6 +2073,10 @@ sendemail.smtpencryption:: sendemail.smtpssl:: Deprecated alias for 'sendemail.smtpencryption = ssl'. +sendemail.smtpsslcertpath:: + Path to ca-certificates (either a directory or a single file). + Set it to an empty string to disable certificate verification. + sendemail.<identity>.*:: Identity-specific versions of the 'sendemail.*' parameters found below, taking precedence over those when the this diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index 40a9a9abc..f0e57a597 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -198,6 +198,12 @@ must be used for each option. --smtp-ssl:: Legacy alias for '--smtp-encryption ssl'. +--smtp-ssl-cert-path:: + Path to ca-certificates (either a directory or a single file). + Set it to an empty string to disable certificate verification. + Defaults to the value set to the 'sendemail.smtpsslcertpath' + configuration variable, if set, or `/etc/ssl/certs` otherwise. + --smtp-user=<user>:: Username for SMTP-AUTH. Default is the value of 'sendemail.smtpuser'; if a username is not specified (with '--smtp-user' or 'sendemail.smtpuser'), |