Merge branch 'rs/rebase'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 465eb13e76dca5cf4daad9d5ea773f4743452c75..e669003f72de9be376f04847faf2a125c147491e 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -116,6 +116,10 @@ apply.whitespace::
        Tells `git-apply` how to handle whitespaces, in the same way
        as the '--whitespace' option. See gitlink:git-apply[1].
 
+pager.color::
+       A boolean to enable/disable colored output when the pager is in
+       use (default is true).
+
 diff.color::
        When true (or `always`), always use colors in patch.
        When false (or `never`), never.  When set to `auto`, use