diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-19 20:31:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-19 20:31:08 (GMT) |
| commit | 574d51b575d9025d57c610c3b571ca58d347d0da (patch) | |
| tree | 5f409c38a354aace88e787d5417798cf6ded7d0d /Documentation | |
| parent | 1468a5839309033feb2e58943babdd48b8e2d151 (diff) | |
| parent | 4bc444eb64173f770c1d1dba2ed3db393c2a9b18 (diff) | |
| download | git-574d51b575d9025d57c610c3b571ca58d347d0da.zip git-574d51b575d9025d57c610c3b571ca58d347d0da.tar.gz git-574d51b575d9025d57c610c3b571ca58d347d0da.tar.bz2 | |
Merge branch 'mv/ssl-ftp-curl'
Does anybody really use commit walkers over (s)ftp?
* mv/ssl-ftp-curl:
Support FTP-over-SSL/TLS for regular FTP
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 42b0f3b..21d4447 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1465,6 +1465,14 @@ http.sslCAPath:: with when fetching or pushing over HTTPS. Can be overridden by the 'GIT_SSL_CAPATH' environment variable. +http.sslTry:: + Attempt to use AUTH SSL/TLS and encrypted data transfers + when connecting via regular FTP protocol. This might be needed + if the FTP server requires it for security reasons or you wish + to connect securely whenever remote FTP server supports it. + Default is false since it might trigger certificate verification + errors on misconfigured servers. + http.maxRequests:: How many HTTP requests to launch in parallel. Can be overridden by the 'GIT_HTTP_MAX_REQUESTS' environment variable. Default is 5. |