Merge branch 'js/http-custom-headers'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 42d2b50477b2863c2d0d93b1e80d70cf85bc5451..c7bbe98ebae256de6163f97eeded0965bf1f5f80 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1655,6 +1655,12 @@ http.emptyAuth::
        a username in the URL, as libcurl normally requires a username for
        authentication.
 
+http.extraHeader::
+       Pass an additional HTTP header when communicating with a server.  If
+       more than one such entry exists, all of them are added as extra
+       headers.  To allow overriding the settings inherited from the system
+       config, an empty value will reset the extra headers to the empty list.
+
 http.cookieFile::
        File containing previously stored cookie lines which should be used
        in the Git http session, if they match the server. The file format