a few more .mailmap entries

  Trying to pick a canonical email for each, so that

    git shortlog -se

  shows only one line per person.

diff --git a/.mailmap b/.mailmap
index 944be9e..39c7d1d 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -1,7 +1,31 @@
-Alastair Bridgewater <nyef@arisu.lisphacker.com> lisphacker <lisphacker>
-Tobias C. Rittweiler <trittweiler@users.sourceforge.net> trittweiler <trittweiler>
+Alastair Bridgewater <lisphacker@users.sourceforge.net> lisphacker <lisphacker>
+<lisphacker@users.sourceforge.net> <nyef@arisu.lisphacker.com>
+<lisphacker@users.sourceforge.net> <nyef@kana.lisphacker.com>
+<lisphacker@users.sourceforge.net> <nyef@virtdev-1.lisphacker.com>
+<lisphacker@users.sourceforge.net> <nyef_sbcl@lisphacker.com>
+
+Christophe Rhodes <csr21@cantab.net> <csr21@cam.ac.uk>
+
+Cyrus Harmon <ch-sbcl@bobobeach.com> <ch-github@bobobeach.com>
+
+Jim Wise <jimwise@users.sourceforge.net> <jwise@draga.com>
+<jimwise@users.sourceforge.net> <jwise@menegroth.draga.com>
+<jimwise@users.sourceforge.net> jimwise <jimwise>
+
 Martin Cracauer <cracauer@google.com> cracauer <cracauer>
-Richard M Kreuter <kreuter@users.sourceforge.net> kreuter <kreuter>
+
+Nathan Froyd <froydnj@gmail.com> <froydnj@cs.rice.edu>
+
+Nikodemus Siivola <nikodemus@random-state.net> <nikodemus@sb-studio.net>
+
 NIIMI Satoshi <sa2c@users.sourceforge.net> sa2c <sa2c>
+
 Paul Khuong <pvk@pvk.ca> pkhuong <pkhuong>
-Jim Wise <jimwise@users.sourceforge.net> jimwise <jimwise>
+
+Richard M Kreuter <kreuter@users.sourceforge.net> kreuter <kreuter>
+
+Robert Brown <brown@google.com> <robert.brown@gmail.com>
+
+Stas Boukarev <stassats@users.sourceforge.net> <stassats@gmail.com>
+
+Tobias C. Rittweiler <trittweiler@users.sourceforge.net> trittweiler <trittweiler>