Merge branch 'mm/readme-markdown'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 542cb229c86415aeb338814c2caf4e746d3c33f5..2cd6bdd7d2bc2816c1a9aed1c6a26bbd3285777c 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1733,6 +1733,14 @@ http.sslCAPath::
        with when fetching or pushing over HTTPS. Can be overridden
        by the 'GIT_SSL_CAPATH' environment variable.
 
+http.pinnedpubkey::
+       Public key of the https service. It may either be the filename of
+       a PEM or DER encoded public key file or a string starting with
+       'sha256//' followed by the base64 encoded sha256 hash of the
+       public key. See also libcurl 'CURLOPT_PINNEDPUBLICKEY'. git will
+       exit with an error if this option is set but not supported by
+       cURL.
+
 http.sslTry::
        Attempt to use AUTH SSL/TLS and encrypted data transfers
        when connecting via regular FTP protocol. This might be needed