diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-19 14:26:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-19 14:26:57 -0700 |
| commit | 7692782cd994796eb7bd0bed592669c5090289bb (patch) | |
| tree | 655ab8fe687f41ed4743060f65e7e9d74bd65b9b /config.txt | |
| parent | ea3b7522a07a46e55d4cee4aa64f7f1459229f0e (diff) | |
| download | git-htmldocs-7692782cd994796eb7bd0bed592669c5090289bb.tar.gz | |
Autogenerated HTML docs for v1.8.2.1-501-gd2949
Diffstat (limited to 'config.txt')
| -rw-r--r-- | config.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/config.txt b/config.txt index 42b0f3ba4..29559c88a 100644 --- a/config.txt +++ b/config.txt @@ -807,7 +807,8 @@ color.branch:: color.branch.<slot>:: Use customized color for branch coloration. `<slot>` is one of `current` (the current branch), `local` (a local branch), - `remote` (a remote-tracking branch in refs/remotes/), `plain` (other + `remote` (a remote-tracking branch in refs/remotes/), + `upstream` (upstream tracking branch), `plain` (other refs). + The value for these configuration variables is a list of colors (at most @@ -1465,6 +1466,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. |