summaryrefslogtreecommitdiff
path: root/Documentation/git-send-email.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-01-14 20:33:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-01-14 20:33:50 (GMT)
commit8128835f91f67741c931858d5523f1ee57ef0fce (patch)
tree0baab7e0277149329885f71c2d5924b3f1e14102 /Documentation/git-send-email.txt
parent41753312e1020880d9d1d488e58f8d7860d84579 (diff)
parentbcfe6f327d7a3ec64aca60beef377f5ada0c9b96 (diff)
downloadgit-8128835f91f67741c931858d5523f1ee57ef0fce.zip
git-8128835f91f67741c931858d5523f1ee57ef0fce.tar.gz
git-8128835f91f67741c931858d5523f1ee57ef0fce.tar.bz2
Merge branch 'aw/doc-smtp-ssl-cert-path'
A long overdue documentation update to match an age-old code update. * aw/doc-smtp-ssl-cert-path: correct smtp-ssl-cert-path description
Diffstat (limited to 'Documentation/git-send-email.txt')
-rw-r--r--Documentation/git-send-email.txt13
1 files changed, 9 insertions, 4 deletions
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index e04849e..f248a86 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -214,10 +214,15 @@ must be used for each option.
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.
+ Path to a store of trusted CA certificates for SMTP SSL/TLS
+ certificate validation (either a directory that has been processed
+ by 'c_rehash', or a single file containing one or more PEM format
+ certificates concatenated together: see verify(1) -CAfile and
+ -CApath for more information on these). Set it to an empty string
+ to disable certificate verification. Defaults to the value of the
+ 'sendemail.smtpsslcertpath' configuration variable, if set, or the
+ backing SSL library's compiled-in default otherwise (which should
+ be the best choice on most platforms).
--smtp-user=<user>::
Username for SMTP-AUTH. Default is the value of 'sendemail.smtpuser';