summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-05-22 19:41:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-05-22 19:41:45 (GMT)
commit39fa79178feb1ce72050ebd21b9e34f158e8befa (patch)
tree2d260dcc6491537e26df4d3d8b8ada0b448eb41f /Documentation
parentb54301bdadfd3195d64e95ef6f58dfdf102e3d26 (diff)
parentf6f2a9e42d14e61429af418d8038aa67049b3821 (diff)
downloadgit-39fa79178feb1ce72050ebd21b9e34f158e8befa.zip
git-39fa79178feb1ce72050ebd21b9e34f158e8befa.tar.gz
git-39fa79178feb1ce72050ebd21b9e34f158e8befa.tar.bz2
Merge branch 'ls/http-ssl-cipher-list'
Introduce http.<url>.SSLCipherList configuration variable to tweak the list of cipher suite to be used with libcURL when talking with https:// sites. * ls/http-ssl-cipher-list: http: add support for specifying an SSL cipher list
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt13
1 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 948b8b0..efea933 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1569,6 +1569,19 @@ http.saveCookies::
If set, store cookies received during requests to the file specified by
http.cookieFile. Has no effect if http.cookieFile is unset.
+http.sslCipherList::
+ A list of SSL ciphers to use when negotiating an SSL connection.
+ The available ciphers depend on whether libcurl was built against
+ NSS or OpenSSL and the particular configuration of the crypto
+ library in use. Internally this sets the 'CURLOPT_SSL_CIPHER_LIST'
+ option; see the libcurl documentation for more details on the format
+ of this list.
++
+Can be overridden by the 'GIT_SSL_CIPHER_LIST' environment variable.
+To force git to use libcurl's default cipher list and ignore any
+explicit http.sslCipherList option, set 'GIT_SSL_CIPHER_LIST' to the
+empty string.
+
http.sslVerify::
Whether to verify the SSL certificate when fetching or pushing
over HTTPS. Can be overridden by the 'GIT_SSL_NO_VERIFY' environment