From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Sun, 30 Apr 2023 03:51:37 +0000 (-0700) Subject: [3.11] Update name in acknowledgements and add mailmap (GH-103696) (#104002) X-Git-Tag: v3.11.4~142 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba16324b276c7b2b5ecf09479f30fc82c12192ae;p=thirdparty%2FPython%2Fcpython.git [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 Co-authored-by: Jelle Zijlstra --- 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 diff --git a/Misc/ACKS b/Misc/ACKS index c7c0677c5ba1..288985c7edde 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