fast-export: rename the signed tag mode 'ignore' to 'verbatim'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 15745de67bb5c05f3a3454d2d985b7d04b8c899a..6ae11842e5d71f201f8901922db8d9bdafb2d17b 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -552,7 +552,8 @@ access method.
 
 http.proxy::
        Override the HTTP proxy, normally configured using the 'http_proxy'
-       environment variable (see gitlink:curl[1]).
+       environment variable (see gitlink:curl[1]).  This can be overridden
+       on a per-remote basis; see remote.<name>.proxy
 
 http.sslVerify::
        Whether to verify the SSL certificate when fetching or pushing
@@ -702,6 +703,11 @@ remote.<name>.url::
        The URL of a remote repository.  See gitlink:git-fetch[1] or
        gitlink:git-push[1].
 
+remote.<name>.proxy::
+       For remotes that require curl (http, https and ftp), the URL to
+       the proxy to use for that remote.  Set to the empty string to
+       disable proxying for that remote.
+
 remote.<name>.fetch::
        The default set of "refspec" for gitlink:git-fetch[1]. See
        gitlink:git-fetch[1].