Document 'git (rev-list|log) --merges'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index bf97e1dee2b3507ded3ced00e9656bdf0b42f43b..cb6832b4e80efc7dc34690f92c63ba4ee12529c7 100644 (file)
--- 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