diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-08-03 23:36:08 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-03 23:36:08 +0300 |
| commit | 87098a047be46ee69da056336109eee2139c1398 (patch) | |
| tree | 6153173514050f41a47867414dc972894c36747c /Documentation | |
| parent | 8e56affcb52e2cf344437a892356a419985ea4ba (diff) | |
| parent | ec031da9f97a2545601304b5ac1e93fee09425b4 (diff) | |
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()
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-cat-file.txt | 6 |
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 |