Merge branch 'sb/maint-octopus'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index b5b27ba8d345e0a0bc5f5e0d406de14d2714829c..23a965eed7286ba9f92417bdde2f6dd1a0c57bbd 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1468,6 +1468,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].