diff --git a/.gitignore b/.gitignore
index 04cb0bc..2e77b49 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@
 !.gitmodules
 !.editorconfig
 !.clang-format
+!.mailmap
 !/.github/
 
 # hide output files
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..f2006a4
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,6 @@
+# Ensures authors (listed with `git shortlog -sne`) show up as one person, rather than multiple.
+# Please keep the entries sorted using `LC_ALL=C sort`
+# Relevant for when people change their e-mail, or their names get mangled for some reason or another.
+Quinn <quinn@thepigeongenerator.xyz> <99677023+thepigeongenerator@users.noreply.github.com>
+Quinn <quinn@thepigeongenerator.xyz> <quinnthepigeon@gmail.com>
+Quinn <quinn@thepigeongenerator.xyz> <quinnthepigeon@proton.me>