Merge branch 'lh/git-file'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 824e416e9f8157d54d3f37e0e520fff5f9a125c0..00f089fee4178b8d402307979b8adc898af6fdc7 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -921,6 +921,10 @@ remote.<name>.push::
        The default set of "refspec" for linkgit:git-push[1]. See
        linkgit:git-push[1].
 
+remote.<name>.mirror::
+       If true, pushing to this remote will automatically behave
+       as if the `\--mirror` option was given on the command line.
+
 remote.<name>.skipDefaultUpdate::
        If true, this remote will be skipped by default when updating
        using the update subcommand of linkgit:git-remote[1].