summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2023-04-30 03:51:37 (GMT)
committerGitHub <noreply@github.com>2023-04-30 03:51:37 (GMT)
commitba16324b276c7b2b5ecf09479f30fc82c12192ae (patch)
treeee251bfba5255c2f6c8cecd6c2bd1bf724a9c368
parent86ef1ce1217eefbe005f61d76fa1f7a3aa01b74e (diff)
downloadcpython-ba16324b276c7b2b5ecf09479f30fc82c12192ae.zip
cpython-ba16324b276c7b2b5ecf09479f30fc82c12192ae.tar.gz
cpython-ba16324b276c7b2b5ecf09479f30fc82c12192ae.tar.bz2
[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>
-rw-r--r--.mailmap3
-rw-r--r--Misc/ACKS2
2 files changed, 4 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
new file mode 100644
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 c7c0677..288985c 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