Merge branch 'bg/fetch-multi'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 55d7e11da265843801ba53634dbb5f2f1d0ef20a..657f0016d39863770bd41f0eed5f746b6915516b 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1437,7 +1437,13 @@ remote.<name>.mirror::
 
 remote.<name>.skipDefaultUpdate::
        If true, this remote will be skipped by default when updating
-       using the update subcommand of linkgit:git-remote[1].
+       using linkgit:git-fetch[1] or the `update` subcommand of
+       linkgit:git-remote[1].
+
+remote.<name>.skipFetchAll::
+       If true, this remote will be skipped by default when updating
+       using linkgit:git-fetch[1] or the `update` subcommand of
+       linkgit:git-remote[1].
 
 remote.<name>.receivepack::
        The default program to execute on the remote side when pushing.  See