Merge branch 'maint'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index f7728ec40c712723573db342c1143ae632a6929f..65dc587f7cbf0f913b79915ba70123fd7189d4f7 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1465,6 +1465,10 @@ remote.<name>.tagopt::
        Setting this value to \--no-tags disables automatic tag following when
        fetching from remote <name>
 
+remote.<name>.vcs::
+       Setting this to a value <vcs> will cause git to interact with
+       the remote with the git-remote-<vcs> helper.
+
 remotes.<group>::
        The list of remotes which are fetched by "git remote update
        <group>".  See linkgit:git-remote[1].