[elpa] externals/hyperbole 3b82df5bc6 3/3: Merge pull request #469 from rswgnu/use-mailmap-for-proper-author-name-and-email

[ELPA Syncer]

branch: externals/hyperbole
commit 3b82df5bc62665cda2bfcf88e219473f71f298b6
Merge: 39ba9abd87 5737c8744a
Author: Robert Weiner <rsw@gnu.org>
Commit: GitHub <noreply@github.com>

    Merge pull request #469 from 
rswgnu/use-mailmap-for-proper-author-name-and-email
    
    Add git .mailmap
---
 .mailmap  | 8 ++++++++
 ChangeLog | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..f86a3cfc5f
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,8 @@
+<matsl@gnu.org> <mats.lidell@cag.se>
+<matsl@gnu.org> <matslidell@spotify.com>
+<matsl@gnu.org> <mats.lidell@lidells.se>
+Bob Weiner <rsw@gnu.org> bw <rsw@gnu.org>
+Bob Weiner <rsw@gnu.org> Robert Weiner <rsw@gnu.org>
+Bob Weiner <rsw@gnu.org> Kathy <rsw@gnu.org>
+Bob Weiner <rsw@gnu.org> Barbara Weiner <rsw@gnu.org>
+<rsw@gnu.org> <Bob.Weiner@DuffandPhelps.com>
diff --git a/ChangeLog b/ChangeLog
index c0812d5190..98cd3243fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,11 @@
     (website, release, git-tag-release, ftp): Add confirmation of
     successful operation.
 
+2024-02-19  Mats Lidell  <matsl@gnu.org>
+
+* .mailmap: Add git .mailmap for mapping name and emails for commit
+    authors.
+
 2024-02-19  Bob Weiner  <rsw@gnu.org>
 
 * hyrolo.el (hyrolo-show-post-command): Add.