From: Amethyst Reese <amethyst@n7.gg>
Date: Sun, 30 Apr 2023 03:21:20 +0000 (-0700)
Subject: Update name in acknowledgements and add mailmap (#103696)
X-Git-Tag: v3.12.0b1~361
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4b10ecc29f6ae69e599a5475a62d8e96a8711f90;p=thirdparty%2FPython%2Fcpython.git

Update name in acknowledgements and add mailmap (#103696)

I changed my name last year, and would like to update my name in the
acknowledgements and git history accordingly.

git-mailmap reference: https://git-scm.com/docs/gitmailmap

Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
---

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000000..013c839ed6b7
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,3 @@
+# This file sets the canonical name for contributors to the repository.
+# Documentation: https://git-scm.com/docs/gitmailmap
+Amethyst Reese <amethyst@n7.gg> <john@noswap.com>
diff --git a/Misc/ACKS b/Misc/ACKS
index 65be5cfc3c79..42ec059a7c4e 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1488,7 +1488,7 @@ John Redford
 Kalyan Reddy
 Terry J. Reedy
 Gareth Rees
-John Reese
+Amethyst Reese
 Steve Reeves
 Lennart Regebro
 John Regehr