[3.11] Update name in acknowledgements and add mailmap (GH-103696) (#104002)

Update name in acknowledgements and add mailmap (GH-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

(cherry picked from commit 4b10ecc29f6ae69e599a5475a62d8e96a8711f90)

Co-authored-by: Amethyst Reese <amethyst@n7.gg>
Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>

diff --git a/.mailmap b/.mailmap
new file mode 100644 (file)
index 0000000..013c839
--- /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 c7c0677c5ba13916682493e3e04a06ee3a778649..288985c7edde173b7f3e5660b23d106ebf2dce1d 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1469,7 +1469,7 @@ Marc Recht
 John Redford
 Terry J. Reedy
 Gareth Rees
-John Reese
+Amethyst Reese
 Steve Reeves
 Lennart Regebro
 John Regehr