From ba16324b276c7b2b5ecf09479f30fc82c12192ae Mon Sep 17 00:00:00 2001
From: "Miss Islington (bot)"
 <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 29 Apr 2023 20:51:37 -0700
Subject: [PATCH] [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>
---
 .mailmap  | 3 +++
 Misc/ACKS | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000000..013c839ed6b
--- /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 c7c0677c5ba..288985c7edd 100644
--- 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