summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2012-11-08 21:39:35 +0000
committerThomas Adam <thomas@xteddy.org>2012-11-08 21:39:35 +0000
commite4679172e3f4307b14f0e1715dc33ca640dc038b (patch)
tree363e15f425fc0e3017a4f64e251f2bc6c137a8c9 /.mailmap
parentbe10e8eee6fa443244536fd76110b3863c505cca (diff)
Sanitise additional .mailmap entries
This sanitises multiple author addresses some more, mapping them back to one common entity.
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 3 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index d8344641..a7a401ff 100644
--- a/.mailmap
+++ b/.mailmap
@@ -9,6 +9,8 @@ Matthias Kilian <kili@openbsd.org> kili <kili>
Matthieu Herrb <matthieu@openbsd.org> matthieu <matthieu>
Miod Vallat <miod@openbsd.org> miod <miod>
Nicholas Marriott <nicm@openbsd.org> nicm <nicm>
+Nicholas Marriott <nicm@openbsd.org> no_author <no_author@example.org>
+<nicm@openbsd.org> <nicholas.marriott@gmail.com>
Okan Demirmen <okan@openbsd.org> okan <okan>
Philip Guenther <guenther@openbsd.org> guenther <guenther>
Pierre-Yves Ritschard <pyr@openbsd.org> pyr <pyr>
@@ -18,4 +20,5 @@ Stefan Sperling <stsp@openbsd.org> stsp <stsp>
Stuart Henderson <sthen@openbsd.org> sthen <sthen>
Ted Unangst <tedu@openbsd.org> tedu <tedu>
Theo Deraadt <deraadt@openbsd.org> deraadt <deraadt>
+Thomas Adam <thomas@xteddy.org> Thomas <thomas@xteddy.org>
William Yodlowsky <william@openbsd.org> william <william>