summaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Mark Lodato <lodatom@gmail.com>2010-03-07 11:52:47 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-03-08 00:30:59 -0800
commit00588bb5cd4a7ff5e2b1ded97d4459bfe6aad6eb (patch)
treef3f638046ed38c6e0ad5ebc6f48a8e7973fc9e9d /merge-file.c
parentgrep: Colorize filename, line number, and separator (diff)
downloadtgif-00588bb5cd4a7ff5e2b1ded97d4459bfe6aad6eb.tar.xz
grep: Colorize selected, context, and function lines
Colorize non-matching text of selected lines, context lines, and function name lines. The default for all three is no color, but they can be configured using color.grep.<slot>. The first two are similar to the corresponding options in GNU grep, except that GNU grep applies the color to the entire line, not just non-matching text. Signed-off-by: Mark Lodato <lodatom@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions