Further expand .mailmap to provide unique author/email mapping

Original: e09c783cfcd8c5486a981f9ef7d7c1df4db169ab

.mailmap

 A. G. Wiseman <agw>
 Abhirup Ghosh <abhirup.ghosh@ligo.org>
 Adam Mercer <adam.mercer@ligo.org> <ram>
+Adam Mercer <adam.mercer@ligo.org> <ram@gravity.phys.uwm.edu>
+Adam Mercer <adam.mercer@ligo.org> <ram@mimir.local>
+Adam Mercer <adam.mercer@ligo.org> <ramercer@gmail.com>
+Ajith Parameswaran <ajith.parameswaran@ligo.org> <Ajith.Parameswaran@ligo.org>
+Ajith Parameswaran <ajith.parameswaran@ligo.org> <ajith.parameswaran@ligo.org>
 Ajith Parameswaran <ajith.parameswaran@ligo.org> <ajith>
+Alex Urban <alexander.urban@ligo.org> <alexander.urban@ligo.org>
+Alexander Dietz <Alexander.Dietz@ligo.org> <alexander.dietz@lapp.in2p3.fr>
+Alexander Dietz <Alexander.Dietz@ligo.org> <alexander.dietz@ligo.org>
 Alexander Dietz <Alexander.Dietz@ligo.org> <dietz>
+Alexander Dietz <Alexander.Dietz@ligo.org> <dietz@lappc-f036.in2p3.fr>
+Alexander Harvey Nitz <ahnitz@syr.edu> <alex.nitz@ligo.org>
 Alicia Sintes <alicia.sintes@ligo.org> <sintes>
 Anand S. Sengupta <sengupta>
+Andrea Taracchini <andrea.taracchini@aei.mpg.de> <andrea.taracchini@aei.mpg.de>
 Andres C. Rodriguez <andy>
+Andrew Lundgren <aplundgr@syr.edu> <andrew.lundgren@LIGO.org>
+Andrew Lundgren <aplundgr@syr.edu> <andrew.lundgren@ligo.org>
 Antony Searle <antony.searle@ligo.org> <acsearle>
+Antony Searle <antony.searle@ligo.org> <acsearle@ligo.caltech.edu>
 Anuradha Gupta <anuradha.gupta@ligo.org>
-Archisman Ghosh <archisman.ghosh@icts.res.in>
 Archisman Ghosh <archisman.ghosh@ligo.org>
+Archisman Ghosh <archisman.ghosh@ligo.org> <archisman.ghosh@icts.res.in>
 B. S. Sathyaprakash <b.sathyaprakash@ligo.org> <sathya>
 Badri Krishnan <badri.krishnan@ligo.org> <badkri>
+Badri Krishnan <badri.krishnan@ligo.org> <badri.krishnan@aei.mpg.de>
 Badri Krishnan <badri.krishnan@ligo.org> <badri>
+Ben Aylott <benjamin.aylott@ligo.org> <aylott@atlas1.atlas.local>
+Ben Aylott <benjamin.aylott@ligo.org> <beaylott@gmail.com>
+Ben Aylott <benjamin.aylott@ligo.org> <benjamin.aylott@ligo.org>
+Ben Aylott <benjamin.aylott@ligo.org> <personal@beaylott.is>
 Ben Farr <bfarr@u.northwestern.edu>
+Ben Farr <bfarr@u.northwestern.edu> <farr@uchicago.edu>
 Ben Johnson <bjohnson>
+Ben Lackey <benjaminlackey@gmail.com> <benjamin.lackey@ligo.org>
 Benjamin Owen <ben.owen@ligo.org> <owen>
 Berit Behnke <berit.behnke@ligo.org> <bbehnke>
+Bernd Machenschalk <bernd.machenschalk@ligo.org>
+Bernd Machenschalk <bernd.machenschalk@ligo.org> <Bernd.Machenschalk@aei.mpg.de>
 Bernd Machenschalk <bernd.machenschalk@ligo.org> <bema>
+Bernd Machenschalk <bernd.machenschalk@ligo.org> <bema@cuda.aei.uni-hannover.de>
+Bernd Machenschalk <bernd.machenschalk@ligo.org> <bema@douglas.aei.uni-hannover.de>
+Bernd Machenschalk <bernd.machenschalk@ligo.org> <bema@mbp15.(none)>
+Bernd Machenschalk <bernd.machenschalk@ligo.org> <bema@mbp15.aei.uni-hannover.de>
+Bernd Machenschalk <bernd.machenschalk@ligo.org> <bema@mbp15.local>
+Bernd Machenschalk <bernd.machenschalk@ligo.org> <bema@squeeze.aei.uni-hannover.de>
+Branson Stephens <stephenb@uwm.edu> <branson.stephens@LIGO.ORG>
+Branson Stephens <stephenb@uwm.edu> <branson.stephens@ligo.org>
 Brian Moe <brian.moe@ligo.org> <bmoe>
-Britta Daudert <bdaudert>
+Brian Moe <brian.moe@ligo.org> <bmoe@gravity.phys.uwm.edu>
+Brian Moe <brian.moe@ligo.org> <bmoe@lappy.(none)>
+Brian Moe <brian.moe@ligo.org> <bmoe@oz.(none)>
+Brian Moe <brian.moe@ligo.org> <bmoe@oz.phys.uwm.edu>
+Brian Moe <brian.moe@ligo.org> <lars@moe.phys.uwm.edu>
+Britta Daudert <britta.daudert@ligo.org>
+Britta Daudert <britta.daudert@ligo.org> <bdaudert>
+Britta Daudert <britta.daudert@ligo.org> <bdaudert@atlas2.atlas.local>
+Britta Daudert <britta.daudert@ligo.org> <bdaudert@ligo.org>
 Bruce Allen <bruce.allen@ligo.org> <ballen>
-Carl-johan Haster <cjhaster@star.sr.bham.ac.uk>
+Carl-Johan Haster <carl-johan.haster@ligo.org> <cjhaster@star.sr.bham.ac.uk>
+Chad Hanna <chad.hanna@ligo.org> <chad.hanna@ligo.org>
 Chad Hanna <chad.hanna@ligo.org> <channa>
+Chris Messenger <chris.messenger@ligo.org> <christopher.messenger@glasgow.ac.uk>
 Chris Messenger <chris.messenger@ligo.org> <cm>
 Chris Messenger <christopher.messenger@glasgow.ac.uk>
+Chris Pankow <chris.pankow@ligo.org> <chris.pankow@LIGO.ORG>
+Chris Pankow <chris.pankow@ligo.org> <chris.pankow@ligo.org>
 Chris Van Den Broeck <chris.vandenbroeck@ligo.org> <vdbroeck>
 Christian Roever <christian.roever@ligo.org> <christian>
+Christine Chung <christine.chung@ligo.org> <artax@Artax.local>
 Christine Chung <christine.chung@ligo.org> <cchung>
+Christine Chung <christine.chung@ligo.org> <christine.chung@ligo.org>
 Christopher M. Biwer <christopher.biwer@ligo.org>
+Colin Gill <colin.gill@ligo.org> <cg9v@hades.(none)>
 Colin Gill <colin.gill@ligo.org> <collingill>
 Collin Capano <collin.capano@ligo.org> <cdcapano>
+Collin Capano <collin.capano@ligo.org> <cdcapano@atlas3.atlas.local>
 Craig Robinson <craig.robinson@astro.cf.ac.uk> <spxcar>
+Craig Robinson <craig.robinson@astro.cf.ac.uk> <spxcar@craig-robinsons-macbook.local>
+Craig Robinson <craig.robinson@astro.cf.ac.uk> <spxcar@dyn-209-2-215-64.dyn.columbia.edu>
 Cristina Valeria Torres <cristina.torres@ligo.org> <cristina>
 Curt Cutler <curt.cutler@ligo.org> <cutler>
 D. I. Jones <jones>
@@ -40,12 +89,19 @@ Darren Woods <darren>
 David Chin <dwchin@umich.edu> <dwchin>
 David Churches <dchurches>
 David Hammer <hammerd>
+David Keitel <David.Keitel@aei.mpg.de> <david.keitel@aei.mpg.de>
+David Keitel <David.Keitel@aei.mpg.de> <david.keitel@ligo.org>
+David M. Whitbeck <dmw262>
+David McKechan <david.mckechan@ligo.org> <david.mckechan@ligo.org>
 David McKechan <david.mckechan@ligo.org> <mckechan>
 Denny Mackin <dsmackin>
 Devanka Pathak <devanka>
 Diego Fazi <diego.fazi@ligo.org> <dfazi>
+Dipongkar Talukder <dipongkar.talukder@ligo.org>
+Dipongkar Talukder <dipongkar.talukder@ligo.org> <dtalukder@ldas-grid.ligo.caltech.edu>
 Drew Keppel <drew.keppel@ligo.org> <dkeppel>
 Duncan Brown <duncan.brown@ligo.org> <duncan>
+Duncan Macleod <duncan.macleod@ligo.org> <duncan.macleod@ligo.org>
 Edward Daw <edward.daw@ligo.org> <edaw>
 Eirini Messaritaki <emessarit>
 Eliu Huerta <eliu.huerta@ligo.org>
@@ -53,8 +109,11 @@ Evan Goetz <evan.goetz@ligo.org> <evang>
 Evan Ochsner <evan.ochsner@ligo.org> <evano>
 Frederique Marion <frederique.marion@ligo.org> <marionf>
 Gareth Jones <gareth>
+Gergely Debreczeni <Gergely.Debreczeni@cern.ch>
 Gregory Mendell <gregory.mendell@ligo.org> <gmendell>
+Gregory Mendell <gregory.mendell@ligo.org> <gregory.mendell@ligo.org>
 Heather Fong <hthrfong@gmail.com>
+Heinz-Bernd Eggenstein <heinz-bernd.eggenstein@ligo.org> <heinz-bernd.eggenstein@aei.mpg.de>
 Holger Pletsch <holger.pletsch@ligo.org> <hpletsch>
 I. Yakushin <igor>
 Ian Harry <ian.harry@ligo.org> <spxiwh>
@@ -62,76 +121,150 @@ Ik Siong Heng <siong.heng@ligo.org> <heng>
 Iraj Gholami <gholami>
 Isabel Leonor <leonor>
 Jacob Slutsky <jslutsky>
+James Clark <james.clark@ligo.org> <james.clark@ligo.org>
+Jameson Rollins <jameson.rollins@ligo.org> <jrollins@finestructure.net>
 Janna Goldstein <janna.goldstein@ligo.org>
 Jessica Clayton <jessica.clayton@ligo.org> <jclayton>
 John T. Whelan <john.whelan@ligo.org> <whelan>
 John Veitch <john.veitch@ligo.org> <jveitch>
+John Veitch <john.veitch@ligo.org> <jveitch@ligo.org>
+John Veitch <john.veitch@ligo.org> <jveitch@star.sr.bham.ac.uk>
+John Veitch <john.veitch@ligo.org> <spxjdv1@geo2.arcca.cf.ac.uk>
 Jolien Creighton <jolien.creighton@ligo.org> <jolien>
+Jolien Creighton <jolien.creighton@ligo.org> <jolien@ldas-pcdev1.ligo.caltech.edu>
+Jolien Creighton <jolien.creighton@ligo.org> <jolien@uwm.edu>
+Jordi Burguet-Castell <jordi.burguet-castell@ligo.org> <jordi.burguet.castell@gmail.com>
 Jordi Burguet-Castell <jordi.burguet-castell@ligo.org> <jordi>
 Joseph Betzwieser <joseph.betzwieser@ligo.org> <josephb>
 Julien Sylvestre <julien>
 Junyi Zhang <jyzhang@umich.edu> <jyzhang>
 Kaice T. Reilly <kaice>
+Kari Hodge <kari.hodge@ligo.org> <KariHodge>
 Karl Wette <karl.wette@ligo.org> <kwwette>
+Karsten Wiesner <karsten.wiesner@ligo.org> <karsten.wiesner@aei.mpg.de>
+Kipp Cannon <kipp.cannon@ligo.org> <kcannon@cita.utoronto.ca>
 Kipp Cannon <kipp.cannon@ligo.org> <kipp>
+Larne Pekowsky <lppekows@physics.syr.edu> <larne.pekowsky@ligo.org>
 Larne Pekowsky <lppekows@physics.syr.edu> <lppekows>
+Larne Pekowsky <lppekows@physics.syr.edu> <lppekows@ldas-pcdev1.ligo-wa.caltech.edu>
 Larry Price <larry.price@ligo.org> <larry>
+Larry Price <larry.price@ligo.org> <larry@ldas-pcdev1.ligo.caltech.edu>
+Leo Singer <leo.singer@ligo.org> <leo.singer@nasa.gov>
+Lightweight DataBase Dumper <ldbd@segdb-test.phy.syr.edu> <ldbd@ldr.ligo.caltech.edu>
 Lisa Goggin <lisa.goggin@ligo.org> <lgoggin>
 Llucia Sancho de la Jordana <llucia>
 Lucia Santamaria <lucia>
+László Veréb <vereblaszlo@titan.physx.u-szeged.hu> <lipiboy@gmail.com>
 Maria Alessandra Papa <maria.papa@ligo.org> <papa>
+Marie Anne Bizouard <marieanne.bizouard@ligo.org> <mabizoua@ldas-grid.ligo.caltech.edu>
 Mark Stephen Williamsen <msw>
 Matt Tibbits <tibbits>
 Matthew Pitkin <matthew.pitkin@ligo.org> <mpitkin>
+Michael Coughlin <michael.coughlin@ligo.org> <coughlim@carleton.edu>
+Michael Coughlin <michael.coughlin@ligo.org> <mcoughlin@sugar-dev2.phy.syr.edu>
+Michael Landry <michael.landry@ligo.org> <landry_m>
+Michael Puerrer <michael.puerrer@ligo.org> <Michael.Puerrer@astro.cf.ac.uk>
+Michael Puerrer <michael.puerrer@ligo.org> <Michael.Puerrer@ligo.org>
 Michele Vallisneri <michele.vallisneri@ligo.org> <vallis>
 Miquel Oliver <miquel.oliver@ligo.org>
+Munier A Salem <msalem@pcdev1.phys.uwm.edu> <msalem@pcdev1.phys.uwm.edu>
+Nickolas Fotopoulos <nvf@gravity.phys.uwm.edu> <nickolas.fotopoulos@ligo.org>
 Nickolas Fotopoulos <nvf@gravity.phys.uwm.edu> <nvf>
 Ofek Birnholtz <ofek.birnholtz@mail.huji.ac.il>
+Oliver Bock <oliver.bock@ligo.org> <oliver.bock@aei.mpg.de>
 Patrick Brady <patrick.brady@ligo.org> <patrick>
+Paul T Baker <paul.baker@ligo.org> <paul.baker>
+Paul T Baker <paul.baker@ligo.org> <pbaker@ldas-grid.ligo.caltech.edu>
+Peter F. Couvares <pfcouvar@syr.edu> <pfc@syr-052-149.syr.edu>
+Peter F. Couvares <pfcouvar@syr.edu> <pfcouvar@syr.edu>
 Peter Shawhan <peter.shawhan@ligo.org> <pshawhan>
 Philip Charlton <philip.charlton@ligo.org> <charlton>
-Ping Wei <piwei@physics.syr.edu> <piwei>
+Ping Wei <ping.wei@ligo.org>
+Ping Wei <ping.wei@ligo.org> <piwei>
+Ping Wei <ping.wei@ligo.org> <piwei@physics.syr.edu>
+Pinkesh Patel <pinkesh.patel@ligo.org> <pinkesh.patel@ligo.org>
 Pinkesh Patel <pinkesh.patel@ligo.org> <ppatel>
 Qi Chu <qi.chu@ligo.org>
+Qi Chu <qichu@ldas-pcdev1.ligo.caltech.edu> <qi.chu@ligo.org>
 Rahul Biswas <rahul.biswas@ligo.org> <rahul>
+Reed Essick <reed.essick@ligo.org> <reed.essick@ldas-pcdev2.ligo-la.caltech.edu>
+Reinhard Prix <reinhard.prix@ligo.org> <Reinhard.Prix@ligo.org>
+Reinhard Prix <reinhard.prix@ligo.org> <ghf@gco-fe1.(none)>
 Reinhard Prix <reinhard.prix@ligo.org> <reinhard>
+Reinhard Prix <reinhard.prix@ligo.org> <repr@atlas5.atlas.local>
 Reinhard Prix <repr@atlas5.atlas.local>
 Rejean Dupuis <rejean@caltech.edu> <rejean>
+Riccardo Sturani <riccardo.sturani@ligo.org> <riccardo.sturani@uniurb.it>
+Riccardo Sturani <riccardo.sturani@ligo.org> <riccardo@riccardo-laptop.(none)>
 Romain Gouaty <romain.gouaty@ligo.org> <romain>
+Romain Gouaty <romain.gouaty@ligo.org> <romain@pcdev1.phys.uwm.edu>
+Rory Smith <rory.smith@ligo.org> <rory.smith@ligo.org>
+Ruslan Vaulin <ruslan.vaulin@ligo.org> <ruslan.vaulin@ligo.org>
+Ruslan Vaulin <ruslan.vaulin@ligo.org> <ruslan.vaulinn@ligo.org>
 Ruslan Vaulin <ruslan.vaulin@ligo.org> <vaulin>
+Ruslan Vaulin <ruslan.vaulin@ligo.org> <vaulin@pcdev1.phys.uwm.edu>
 Ruslan Vaulin <ruslan.vaulinn@ligo.org>
 Saikat Ray-Majumder <saikat>
+Salvatore Vitale <salvatore.vitale@ligo.org> <svitale@ligo.mit.edu>
+Salvatore Vitale <salvatore.vitale@ligo.org> <svitale@ligo.org>
+Salvatore Vitale <salvatore.vitale@ligo.org> <svitale@nikhef.nl>
 Sarah Caudill <sarah.caudill@ligo.org> <scaudill>
+Satya Mohapatra <satyanarayan.raypitambarmohapatra@ligo.org> <satya@atlas2.atlas.local>
+Satya Mohapatra <satyanarayan.raypitambarmohapatra@ligo.org> <satya@physics.umass.edu>
+Satya Mohapatra <satyanarayan.raypitambarmohapatra@ligo.org> <satyanarayan.raypitambarmohapatra>
 Scott Koranda <scott.koranda@ligo.org> <skoranda>
 Sean Seader <sseader>
 Sebastian Khan <sebastian.khan@atlas2.atlas.local>
 Sebastian Khan <sebastian.khan@ligo.org>
+Sebastian Khan <sebastian.khan@ligo.org> <sebastian.khan@atlas2.atlas.local>
 Shin Kee Chung <shinkee.chung@ligo.org> <shinkee>
 Stanislav Babak <Stanislav.Babak@aei.mpg.de> <babak>
+Stanislav Babak <Stanislav.Babak@aei.mpg.de> <stas@switchblade.aei.mpg.de>
 Stanislav Babak <stas@switchblade.aei.mpg.de>
+Steffen Grunewald <Steffen.Grunewald@aei.mpg.de> <steffen.grunewald@aei.mpg.de>
+Steffen Grunewald <Steffen.Grunewald@aei.mpg.de> <steffen.grunewald@ligo.org>
 Steffen Grunewald <Steffen.Grunewald@aei.mpg.de> <steffeng>
 Stephen Fairhurst <stephen.fairhurst@ligo.org> <sfairhur>
 Stephen Privitera <stephen.privitera@ligo.org>
+Stephen Privitera <stephen.privitera@ligo.org> <sprivite@ldas-grid.ligo-wa.caltech.edu>
+Stephen Privitera <stephen.privitera@ligo.org> <stephen.privitera@aei.mpg.de>
 Steve Berukoff <sberukoff>
 Sukanta Bose <sukanta.bose@ligo.org> <bose>
 Tania Regimbau <tania.regimbau@ligo.org> <tania>
 Teviet Creighton <teviet.creighton@ligo.org> <teviet>
 Thomas Cokelaer <Thomas.Cokelaer@astro.cf.ac.uk> <thomas>
 Thomas Essinger-Hileman <essinger>
-Tomoki Isogai <isogait@carleton.edu> <isogait>
-Unknown user 'ajw' <ajw>
-Unknown user 'akbar' <akbar>
-Unknown user 'btucker' <btucker>
-Unknown user 'charlie' <charlie>
-Unknown user 'gbb' <gbb>
-Unknown user 'gravity-waves' <smp.ligo@gmail.com>
-Unknown user 'laltest' <laltest>
+Tito Dal Canton <tito.canton@ligo.org> <tito.dalcanton@aei.mpg.de>
+Tomoki Isogai <tomoki.isogai@ligo.org>
+Tomoki Isogai <tomoki.isogai@ligo.org> <isogait>
+Tomoki Isogai <tomoki.isogai@ligo.org> <isogait@carleton.edu>
+Tyson Littenberg <tyson.littenberg@ligo.org> <tyson.littenberg@gmail.com>
+UNKNOWN AUTHOR <USER@ligo.org>
+UNKNOWN AUTHOR <ajw>
+UNKNOWN AUTHOR <akbar>
+UNKNOWN AUTHOR <albert.einstein@ligo.org>
+UNKNOWN AUTHOR <btucker>
+UNKNOWN AUTHOR <charlie>
+UNKNOWN AUTHOR <gbb>
+UNKNOWN AUTHOR <gdb_processor@trout.phys.uwm.edu>
+UNKNOWN AUTHOR <laltest>
+UNKNOWN AUTHOR <ldbd@segdb-test.phy.syr.edu>
+UNKNOWN AUTHOR <smp.ligo@gmail.com>
+Valeriu Predoi <valeriu.predoi@ligo.org> <valeriu@valeriu-laptop.(none)>
 Virginia Re <virginia.re@ligo.org> <virginia>
+Vivien Raymond <vivien.raymond@ligo.org> <vra623@quser01.(none)>
+Vladimir Dergachev <volodya@caltech.edu> <vdergach@couch.ligo.caltech.edu>
+Vladimir Dergachev <volodya@caltech.edu> <vladimir.dergachev@ligo.org>
 Vladimir Dergachev <volodya@caltech.edu> <volodya>
 Warren Anderson <warren.anderson@ligo.org> <warren>
+Will M. Farr <w-farr@northwestern.edu> <will.farr@ligo.org>
+Will Vousden <will.vousden@ligo.org> <will@vousden.me.uk>
 Xavier Siemens <xavier.siemens@ligo.org> <siemens>
 Xavier Siemens <xavier.siemens@ligo.org> <xavier>
 Y. Itoh <yousuke>
+Yan Wang <yan.wang@ligo.org> <yawang@pople014.science.uwa.edu.au>
 Yan Wang <yawang@pople014.science.uwa.edu.au>
-Yi Pan <yi.pan@ligo.org> <ypan>
+Yi Pan <ypan@umd.edu> <yi.pan@ligo.org>
+Yi Pan <ypan@umd.edu> <ypan>
+Yingsheng Ji <yingsheng.ji@ligo.org>
 Zach Etienne <zachetie@gmail.com>

.mailmap-update

+#!/usr/bin/perl
+use strict;
+open IN, "git shortlog -s -e -n |" or die $!;
+my %authors;
+my %emails;
+while (<IN>) {
+    chomp;
+    $_ =~ m/^\s*\d+\s+([^<>]+)\s+<([^>]+)>\s*$/ or die;
+    my $author = $1;
+    my $email = $2;
+    next if $author =~ /^UNKNOWN/;
+    if (defined($authors{$author})) {
+        print "$authors{$author} <$email>\n";
+    } elsif (defined($emails{$email})) {
+        print "$emails{$email} <$email>\n";
+    } else {
+        $authors{$author} = $emails{$email} = "$author <$email>";
+    }
+}