Merge branch 'maint'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 3a86d1f8f05317717d718a6db7c5e0f9acb47d6b..2fecbe32a68bd981959735dd14e6e311d16b233a 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1319,6 +1319,9 @@ remote.<name>.url::
        The URL of a remote repository.  See linkgit:git-fetch[1] or
        linkgit:git-push[1].
 
+remote.<name>.pushurl::
+       The push URL of a remote repository.  See linkgit: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