diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-01-14 12:33:50 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-01-14 12:33:50 -0800 |
commit | 8128835f91f67741c931858d5523f1ee57ef0fce (patch) | |
tree | 0baab7e0277149329885f71c2d5924b3f1e14102 /Documentation | |
parent | Merge branch 'sp/subtree-doc' (diff) | |
parent | correct smtp-ssl-cert-path description (diff) | |
download | tgif-8128835f91f67741c931858d5523f1ee57ef0fce.tar.xz |
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')
-rw-r--r-- | Documentation/git-send-email.txt | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index e04849e396..f248a8665e 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'; |