Merge branch 'rs/grep-color-words'
commitbf1f639ea2cb54f5dee2f1fe3435d0072ede9abb
authorJunio C Hamano <gitster@pobox.com>
Fri, 31 Oct 2014 18:49:37 +0000 (31 11:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 31 Oct 2014 18:49:47 +0000 (31 11:49 -0700)
treeb507e0cf182b820ee5888e5e58a61130960aaa31
parent81d645d1a10104f23c7d3e90eb24fdb672e9694c
parent79a77109d3d0d364910ff7fa8c605c554dc4c3e0
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
Documentation/config.txt
grep.c
t/t7810-grep.sh