summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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