Update AUTHORS and .mailmap file

[ngircd-alex.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index f7696ca7f68f3d622146eb2c3b6e2ce499217b84..f7e3eb6e5d0dcf062ac14b19ee967ad3bf58496e 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,14 @@
 # mailmap file for git-[short]log and git-blame
+# use "git shortlog -se" to see the list of all authors.
+
+Alexander Barton <alex@barton.de> <anonymous>
+Alexander Barton <alex@barton.de> <alex@kfreebsd.barton.de>
 
-Alexander Barton <anonymous>
 Ali Shemiran <ashemira@ucsd.edu>
+
+Dana Dahlstrom <dana+ngIRCd@cs.ucsd.edu> <dana@cs.ucsd.edu>
+Dana Dahlstrom <dana+ngIRCd@cs.ucsd.edu> <dana+70@cs.ucsd.edu>
+
+DNS <dns@rbose.org>
+
+LucentW <lucent@zebes.info> <LucentW@users.noreply.github.com>