summaryrefslogtreecommitdiffstats
path: root/gitmailmap.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-02-25 17:34:37 -0800
committerJunio C Hamano <gitster@pobox.com>2021-02-25 17:34:37 -0800
commita372d5bb569776befd395d9c66067ecc09f13b96 (patch)
treee9f46a0ff18a8d49520307068a47e8944c44aa3d /gitmailmap.txt
parenta70c988a0584e1197ffd19b26c28e9790da32363 (diff)
downloadgit-htmldocs-a372d5bb569776befd395d9c66067ecc09f13b96.tar.gz
Autogenerated HTML docs for v2.31.0-rc0
Diffstat (limited to 'gitmailmap.txt')
-rw-r--r--gitmailmap.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/gitmailmap.txt b/gitmailmap.txt
index 052209b33..3fb39f801 100644
--- a/gitmailmap.txt
+++ b/gitmailmap.txt
@@ -50,9 +50,9 @@ which allows mailmap to replace both the name and the email of a
commit matching both the specified commit name and email address.
Both E-Mails and names are matched case-insensitively. For example
-this would also match the 'Commit Name <commit@email.xx>' above:
+this would also match the 'Commit Name <commit&#64;email.xx>' above:
--
-Proper Name <proper@email.xx> CoMmIt NaMe <CoMmIt@EmAiL.xX>
+ Proper Name <proper@email.xx> CoMmIt NaMe <CoMmIt@EmAiL.xX>
--
EXAMPLES
@@ -79,9 +79,9 @@ Jane Doe <jane@example.com>
Jane Doe <jane@desktop.(none)>
------------
-Note that there's no need to map the name for 'jane@laptop.(none)' to
+Note that there's no need to map the name for '<jane&#64;laptop.(none)>' to
only correct the names. However, leaving the obviously broken
-`<jane@laptop.(none)>' and '<jane@desktop.(none)>' E-Mails as-is is
+'<jane&#64;laptop.(none)>' and '<jane&#64;desktop.(none)>' E-Mails as-is is
usually not what you want. A `.mailmap` file which also corrects those
is: