]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'sa/cat-file-mailmap--batch-check'
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Jan 2023 06:07:17 +0000 (15:07 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Jan 2023 06:07:17 +0000 (15:07 +0900)
'cat-file' gains mailmap support for its '--batch-check' and '-s'
options.

* sa/cat-file-mailmap--batch-check:
  cat-file: add mailmap support to --batch-check option
  cat-file: add mailmap support to -s option

1  2 
builtin/cat-file.c

Simple merge