summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2014-10-27 19:23:05 +0100
committerJunio C Hamano <gitster@pobox.com>2014-10-28 10:33:50 -0700
commit79a77109d3d0d364910ff7fa8c605c554dc4c3e0 (patch)
treec83513d1fdb135cad73d3865e30541f25084a540 /Documentation/config.txt
parenteeff891ac756fd97a05476446f15269b714ce4cc (diff)
downloadgit-79a77109d3d0d364910ff7fa8c605c554dc4c3e0.tar.gz
grep: add color.grep.matchcontext and color.grep.matchselectedrs/grep-color-words
The config option color.grep.match can be used to specify the highlighting color for matching strings. Add the options matchContext and matchSelected to allow different colors to be specified for matching strings in the context vs. in selected lines. This is similar to the ms and mc specifiers in GNU grep's environment variable GREP_COLORS. Tests are from Zoltan Klinger's earlier attempt to solve the same issue in a different way. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index ab26963d61..aa881fca1a 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -860,7 +860,11 @@ color.grep.<slot>::
`linenumber`;;
line number prefix (when using `-n`)
`match`;;
- matching text
+ matching text (same as setting `matchContext` and `matchSelected`)
+`matchContext`;;
+ matching text in context lines
+`matchSelected`;;
+ matching text in selected lines
`selected`;;
non-matching text in selected lines
`separator`;;