From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 Nov 2021 20:48:08 +0000 (-0700)
Subject: Merge branch 'hm/paint-hits-in-log-grep'
X-Git-Tag: v2.34.0-rc1~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b93d7206919e9eac22b3ca0291bce8da65960595;p=thirdparty%2Fgit.git

Merge branch 'hm/paint-hits-in-log-grep'

"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
---

b93d7206919e9eac22b3ca0291bce8da65960595