summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-22 11:24:17 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-22 11:24:17 -0700
commit07b83b5d98a8b7230f3ebafeb4ecf2916c011db9 (patch)
tree0d513f8a8eeb94188c4a19876f0c5acbee2cf8c3 /Documentation/config.txt
parente683889b75a32b8c2bf11c8fa0cf851087bc5415 (diff)
parent35035bbf074d1a4c59cd5f99282c12197105da08 (diff)
downloadgit-07b83b5d98a8b7230f3ebafeb4ecf2916c011db9.tar.gz
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/config.txt')
-rw-r--r--Documentation/config.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 50067ee15c..e0b923f428 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