Merge branch 'sa/cat-file-mailmap--batch-check'
commit319c3abadb047b37e33195f29486794501c8f83f
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Jan 2023 06:07:17 +0000 (5 15:07 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Jan 2023 06:07:17 +0000 (5 15:07 +0900)
treed8e488dfd6f05e914c49ac59a2a692e97c03710b
parent2b4f5a4e4bb102ac8d967cea653ed753b608193c
parenta797c0ea042af697d82ad475b9f354c4a33a9047
Merge branch 'sa/cat-file-mailmap--batch-check'

'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
builtin/cat-file.c