summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuuso Lapinlampi <wub@partyvan.eu>2015-10-31 14:43:01 +0100
committerJuuso Lapinlampi <wub@partyvan.eu>2015-10-31 14:43:01 +0100
commitd4944ad6e223d1bec49be0319c2af8a96cccc646 (patch)
treec47b894c95ed4e6bb432a192bc36c9b5d677cf46
parent62e74ddcb7e163f2e4eaeeeda9bf7ae90724b775 (diff)
parentc41aa889ba92360cbc7234dd4114b38d9baea42a (diff)
Merge branch 'add-git-mailmap' of wubthecaptain/pomf
Add .mailmap, which is a git-shortlog(1) feature. Maps author names with different names/email addresses under one name. OK ewhal@
-rw-r--r--.mailmap5
1 files changed, 5 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..cabbd3b
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,5 @@
+Eric Johansson <neku@pomf.se>
+Eric Johansson <neku@pomf.se> nokonoko <petanull@gmail.com>
+Eliot Whalan <ewhal@pantsu.cat> <contact@pantsu.cat>
+Juuso Lapinlampi <wub@partyvan.eu>
+alchimist <alchimist@nwa.xyz> cenci0 <alchimist94@gmail.com>