summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmethyst Reese <amethyst@n7.gg>2023-04-30 03:21:20 (GMT)
committerGitHub <noreply@github.com>2023-04-30 03:21:20 (GMT)
commit4b10ecc29f6ae69e599a5475a62d8e96a8711f90 (patch)
tree3137befcbc9b47c1832fa9366d3185d8cd39de90
parent9e011e7c77dad7d0bbb944c44891531606caeb21 (diff)
downloadcpython-4b10ecc29f6ae69e599a5475a62d8e96a8711f90.zip
cpython-4b10ecc29f6ae69e599a5475a62d8e96a8711f90.tar.gz
cpython-4b10ecc29f6ae69e599a5475a62d8e96a8711f90.tar.bz2
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>
-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 65be5cf..42ec059 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