diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-07-09 10:00:36 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-09 10:00:36 +0200 |
| commit | c535d767f7a518b79a0f9b9a70ec746de76da97c (patch) | |
| tree | 84f4889857e93a4a2bf526436ab0c9fd11855688 /Documentation/config.txt | |
| parent | Merge branch 'rs/grep-p' (diff) | |
| parent | http.c: add http.sslCertPasswordProtected option (diff) | |
| download | git-c535d767f7a518b79a0f9b9a70ec746de76da97c.tar.xz git-c535d767f7a518b79a0f9b9a70ec746de76da97c.zip | |
Merge branch 'ml/http'
* ml/http:
http.c: add http.sslCertPasswordProtected option
http.c: prompt for SSL client certificate password
Conflicts:
http.c
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index bf97e1dee2..cb6832b4e8 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1045,6 +1045,12 @@ http.sslKey:: over HTTPS. Can be overridden by the 'GIT_SSL_KEY' environment variable. +http.sslCertPasswordProtected:: + Enable git's password prompt for the SSL certificate. Otherwise + OpenSSL will prompt the user, possibly many times, if the + certificate or private key is encrypted. Can be overridden by the + 'GIT_SSL_CERT_PASSWORD_PROTECTED' environment variable. + http.sslCAInfo:: File containing the certificates to verify the peer with when fetching or pushing over HTTPS. Can be overridden by the |