summaryrefslogtreecommitdiff
path: root/t/t7601-merge-pull-config.sh
diff options
context:
space:
mode:
authorLibravatar Taylor Blau <me@ttaylorr.com>2018-06-22 10:49:39 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-06-22 12:59:02 -0700
commit017c0fcfdb21dd44e2c83f533e9a6d78513e7d8c (patch)
tree727ae1d2986326a63f441f1531491ae978ddfadf /t/t7601-merge-pull-config.sh
parentgrep.c: expose {,inverted} match column in match_line() (diff)
downloadtgif-017c0fcfdb21dd44e2c83f533e9a6d78513e7d8c.tar.xz
grep.[ch]: extend grep_opt to allow showing matched column
To support showing the matched column when calling 'git-grep(1)', teach 'grep_opt' the normal set of options to configure the default behavior and colorization of this feature. Now that we have opt->columnnum, use it to disable short-circuiting over ORs and ANDs so that col and icol are always filled with the earliest matches on each line. In addition, don't return the first match from match_line(), for the same reason. Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7601-merge-pull-config.sh')
0 files changed, 0 insertions, 0 deletions