From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Aug 2022 20:36:08 +0000 (-0700)
Subject: Merge branch 'sa/cat-file-mailmap'
X-Git-Tag: v2.38.0-rc0~104
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87098a047be46ee69da056336109eee2139c1398;p=thirdparty%2Fgit.git

Merge branch 'sa/cat-file-mailmap'

"git cat-file" learned an option to use the mailmap when showing
commit and tag objects.

* sa/cat-file-mailmap:
  cat-file: add mailmap support
  ident: rename commit_rewrite_person() to apply_mailmap_to_header()
  ident: move commit_rewrite_person() to ident.c
  revision: improve commit_rewrite_person()
---

87098a047be46ee69da056336109eee2139c1398