Merge branch 'jc/maint-status-preload' into maint

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 4c36aa95b7d3fc0d456d42bbdfdf5a118931094b..2dc3a0583bde6f5822c88d55e7d0b21670bb7693 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -680,9 +680,7 @@ color.grep::
 
 color.grep.match::
        Use customized color for matches.  The value of this variable
-       may be specified as in color.branch.<slot>.  It is passed using
-       the environment variables 'GREP_COLOR' and 'GREP_COLORS' when
-       calling an external 'grep'.
+       may be specified as in color.branch.<slot>.
 
 color.interactive::
        When set to `always`, always use colors for interactive prompts