aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-cat-file.txt
diff options
context:
space:
mode:
authorSiddharth Asthana <siddharthasthana31@gmail.com>2022-07-19 01:21:02 +0530
committerJunio C Hamano <gitster@pobox.com>2022-07-18 12:55:53 -0700
commitec031da9f97a2545601304b5ac1e93fee09425b4 (patch)
treecde752cf39c6598a3322c42e1f38c4f4c71dbca7 /Documentation/git-cat-file.txt
parent66a8a95315edb3feba1190dcd89a208ae71bda61 (diff)
downloadgit-ec031da9f97a2545601304b5ac1e93fee09425b4.tar.gz
cat-file: add mailmap support
git-cat-file is used by tools like GitLab to get commit tag contents that are then displayed to users. This content which has author, committer or tagger information, could benefit from passing through the mailmap mechanism before being sent or displayed. This patch adds --[no-]use-mailmap command line option to the git cat-file command. It also adds --[no-]mailmap option as an alias to --[no-]use-mailmap. This patch also introduces new test cases to test the mailmap mechanism in git cat-file command. Mentored-by: Christian Couder <christian.couder@gmail.com> Mentored-by: John Cai <johncai86@gmail.com> Helped-by: Phillip Wood <phillip.wood@dunelm.org.uk> Helped-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Siddharth Asthana <siddharthasthana31@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-cat-file.txt')
-rw-r--r--Documentation/git-cat-file.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt
index 24a811f0ef..1880e9bba1 100644
--- a/Documentation/git-cat-file.txt
+++ b/Documentation/git-cat-file.txt
@@ -63,6 +63,12 @@ OPTIONS
or to ask for a "blob" with `<object>` being a tag object that
points at it.
+--[no-]mailmap::
+--[no-]use-mailmap::
+ Use mailmap file to map author, committer and tagger names
+ and email addresses to canonical real names and email addresses.
+ See linkgit:git-shortlog[1].
+
--textconv::
Show the content as transformed by a textconv filter. In this case,
`<object>` has to be of the form `<tree-ish>:<path>`, or `:<path>` in