diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-11-01 13:48:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-11-01 13:48:08 -0700 |
| commit | b93d7206919e9eac22b3ca0291bce8da65960595 (patch) | |
| tree | 1fb405da58548ea2246aa833630706a9ab9bf928 /Documentation/config | |
| parent | Git 2.34-rc0 (diff) | |
| parent | grep/pcre2: fix an edge case concerning ascii patterns and UTF-8 data (diff) | |
| download | tgif-b93d7206919e9eac22b3ca0291bce8da65960595.tar.xz | |
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
Diffstat (limited to 'Documentation/config')
| -rw-r--r-- | Documentation/config/color.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/config/color.txt b/Documentation/config/color.txt index 6e817f6047..1795b2d16b 100644 --- a/Documentation/config/color.txt +++ b/Documentation/config/color.txt @@ -105,9 +105,12 @@ color.grep.<slot>:: `matchContext`;; matching text in context lines `matchSelected`;; - matching text in selected lines + matching text in selected lines. Also, used to customize the following + linkgit:git-log[1] subcommands: `--grep`, `--author` and `--committer`. `selected`;; - non-matching text in selected lines + non-matching text in selected lines. Also, used to customize the + following linkgit:git-log[1] subcommands: `--grep`, `--author` and + `--committer`. `separator`;; separators between fields on a line (`:`, `-`, and `=`) and between hunks (`--`) |