Merge branch 'jc/combined'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 05d657444fc31768f9bf9909324b708ac6fcfd46..026d4cf9ade90cd108d351e372ed862378cde100 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -230,6 +230,18 @@ pull.octopus::
 pull.twohead::
        The default merge strategy to use when pulling a single branch.
 
+remote.<name>.url::
+       The URL of a remote repository.  See gitlink:git-fetch[1] or
+       gitlink:git-push[1].
+
+remote.<name>.fetch::
+       The default set of "refspec" for gitlink:git-fetch[1]. See
+       gitlink:git-fetch[1].
+
+remote.<name>.push::
+       The default set of "refspec" for gitlink:git-push[1]. See
+       gitlink:git-push[1].
+
 repack.usedeltabaseoffset::
        Allow gitlink:git-repack[1] to create packs that uses
        delta-base offset.  Defaults to false.