MNT: Update mailmap, tracking down ambiguous authors

effigies · effigies · commit 50952d7483be · 2019-10-08T07:27:29.000-04:00
diff --git a/.mailmap b/.mailmap
@@ -70,6 +70,7 @@ Horea Christian <horea.christ@yandex.com> <h.chr@mail.ru>
 Isaac Schwabacher <ischwabacher@wisc.edu>
 Jakub Kaczmarzyk <jakubk@mit.edu>
 James Kent <james-kent@uiowa.edu>
+James Kent <james-kent@uiowa.edu> Fred Mertz <mertzf@bargle.argle>
 Janosch Linkersdörfer <linkersdoerfer@gmail.com>
 Jason Wong <jf126dolphin@gmail.com>
 Jason Wong <jf126dolphin@gmail.com> <jasonwong73@ucla.edu>
@@ -80,6 +81,7 @@ Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> <joerg.stadler@lin-magdeburg.de>
 Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> <jstadler@ilin-magdeburg.de>
 Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> <Stadler@lin-magdeburg.de>
 John A. Lee <johnleenimh@gmail.com>
+John A. Lee <johnleenimh@gmail.com> <leej3@users.noreply.github.com>
 Joke Durnez <joke.durnez@gmail.com>
 Josh Warner <silvertrumpet999+github@gmail.com> <warner.joshua@mayo.edu>
 Junhao WEN <anbai106@hotmail.com>
@@ -151,6 +153,7 @@ Shariq Iqbal <shariqiqbal2810@gmail.com>
 Shariq Iqbal <shariqiqbal2810@gmail.com> <shariqiqbal2810@users.noreply.github.com>
 Shoshana Berleant <berleant@stanford.edu> Shoshana Berleant <nope>
 Shoshana Berleant <berleant@stanford.edu> <shoshber@users.noreply.github.com>
+Shoshana Berleant <berleant@stanford.edu> Ubuntu <ubuntu@ip-172-31-43-202.us-west-2.compute.internal>
 Simon Rothmei <srothmei@mailbox.tu-berlin.de>
 Simon Rothmei <srothmei@mailbox.tu-berlin.de> <srothmei@users.noreply.github.com>
 Siqi Liu <lsqshr@gmail.com>

-Original file line number
+Diff line change
 Isaac Schwabacher <[email protected]>
 Jakub Kaczmarzyk <[email protected]>
 James Kent <[email protected]>
 +James Kent <[email protected]> Fred Mertz <[email protected]>
 Janosch Linkersdörfer <[email protected]>
 Jason Wong <[email protected]>
 Jason Wong <[email protected]> <[email protected]>
 Joerg Stadler <[email protected]> <[email protected]>
 Joerg Stadler <[email protected]> <[email protected]>
 John A. Lee <[email protected]>
 +John A. Lee <[email protected]> <[email protected]>
 Joke Durnez <[email protected]>
 Josh Warner <[email protected]> <[email protected]>
 Junhao WEN <[email protected]>
 Shariq Iqbal <[email protected]> <[email protected]>
 Shoshana Berleant <[email protected]> Shoshana Berleant <nope>
 Shoshana Berleant <[email protected]> <[email protected]>
 +Shoshana Berleant <[email protected]> Ubuntu <[email protected]>
 Simon Rothmei <[email protected]>
 Simon Rothmei <[email protected]> <[email protected]>
 Siqi Liu <[email protected]>