Start 1.6.0.X maintenance series

diff --git a/Documentation/config.txt b/Documentation/config.txt
index b8ec01c923a8bdb8614f5c5700a7fda603365e8b..676c39bb8436f35e1471b8dd50fd888ae1ac5c6b 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -978,6 +978,11 @@ pack.packSizeLimit::
        can be overridden by the `\--max-pack-size` option of
        linkgit:git-repack[1].
 
+pager.<cmd>::
+       Allows to set your own pager preferences for each command, overriding
+       the default. If `\--pager` or `\--no-pager` is specified on the command
+       line, it takes precedence over this option.
+
 pull.octopus::
        The default merge strategy to use when pulling multiple branches
        at once.