summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-31 18:49:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-10-31 18:49:47 (GMT)
commitbf1f639ea2cb54f5dee2f1fe3435d0072ede9abb (patch)
treeb507e0cf182b820ee5888e5e58a61130960aaa31 /Documentation
parent81d645d1a10104f23c7d3e90eb24fdb672e9694c (diff)
parent79a77109d3d0d364910ff7fa8c605c554dc4c3e0 (diff)
downloadgit-bf1f639ea2cb54f5dee2f1fe3435d0072ede9abb.zip
git-bf1f639ea2cb54f5dee2f1fe3435d0072ede9abb.tar.gz
git-bf1f639ea2cb54f5dee2f1fe3435d0072ede9abb.tar.bz2
Merge branch 'rs/grep-color-words'
Allow painting or not painting (partial) matches in context lines when showing "grep -C<num>" output in color. * rs/grep-color-words: grep: add color.grep.matchcontext and color.grep.matchselected
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 8212897..7a3294d 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -885,7 +885,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`;;