aboutsummaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-20 14:43:41 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-20 14:43:41 -0800
commit34349bea60ec9cb3e320175cad9eb01b3054e5c6 (patch)
treea716401563f17bcc6b7b425d03b6226c8984b475 /Documentation/config.txt
parent886932e2816ba8554ba0bf6c2c91fdfa6877dd65 (diff)
parent308162372d0aa202ff45743e02253e20a4fac4d7 (diff)
downloadgit-34349bea60ec9cb3e320175cad9eb01b3054e5c6.tar.gz
git-34349bea60ec9cb3e320175cad9eb01b3054e5c6.tar.xz
Merge branch 'jc/grep-lookahead'
* jc/grep-lookahead: grep --no-index: allow use of "git grep" outside a git repository grep: prepare to run outside of a work tree grep: rip out pessimization to use fixmatch() grep: rip out support for external grep grep: optimize built-in grep by skipping lines that do not hit Conflicts: builtin-grep.c t/t7002-grep.sh
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt8
1 files changed, 0 insertions, 8 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 76c7d9c7e..d40b83f85 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -664,14 +664,6 @@ color.grep::
`never`), never. When set to `true` or `auto`, use color only
when the output is written to the terminal. Defaults to `false`.
-color.grep.external::
- The string value of this variable is passed to an external 'grep'
- command as a command line option if match highlighting is turned
- on. If set to an empty string, no option is passed at all,
- turning off coloring for external 'grep' calls; this is the default.
- For GNU grep, set it to `--color=always` to highlight matches even
- when a pager is used.
-
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