]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'hm/paint-hits-in-log-grep'
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Nov 2021 20:48:08 +0000 (13:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Nov 2021 20:48:08 +0000 (13:48 -0700)
"git log --grep=string --author=name" learns to highlight hits just
like "git grep string" does.

* hm/paint-hits-in-log-grep:
  grep/pcre2: fix an edge case concerning ascii patterns and UTF-8 data
  pretty: colorize pattern matches in commit messages
  grep: refactor next_match() and match_one_pattern() for external use

1  2 
Documentation/config/color.txt
grep.h
pretty.c
t/t4202-log.sh

Simple merge
diff --cc grep.h
Simple merge
diff --cc pretty.c
Simple merge
diff --cc t/t4202-log.sh
Simple merge