From f266e85584aa2d4320832ff4a884cfd37d3da83c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jouni=20K=2E=20Sepp=C3=A4nen?= Date: Sat, 31 Oct 2015 11:26:25 +0200 Subject: [PATCH 1/3] Remove some duplicate contributors by editing .mailmap --- .mailmap | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 447df7f4207a..e10de06889db 100644 --- a/.mailmap +++ b/.mailmap @@ -1,46 +1,63 @@ Andrew Dawson Andrew Dawson anykraus anykraus +Ariel Hernán Curiale Ben Cohen Ben Cohen Ben Root Benjamin Root +Casper van der Wel Christoph Gohlke cgohlke Christoph Gohlke C. Gohlke Cimarron Mittelsteadt Cimarron Daniel Hyams Daniel Hyams Daniel Hyams dhyams +David Kua +endolith Eric Dill Eric Dill Erik Bray Erik M. Bray +Eric Ma +Eric Ma Francesco Montesano montefra +Jaime Fernandez +Jake Vanderplas Jake Vanderplas Jake Vanderplas Jake Vanderplas Jake Vanderplas James R. Evans James Evans +Jeff Lutgen Jeffrey Bingham Jeff Bingham Jens Hedegaard Nielsen Jens Hedegaard Nielsen Jens Hedegaard Nielsen Jens H Nielsen Jens Hedegaard Nielsen Jens H. Nielsen Jens Hedegaard Nielsen Jens H. Nielsen John Hunter jdh2358 -Jouni K. Seppänen Jouni K. Seppänen +Jorrit Wronski +Jouni K. Seppänen Julien Schueller jschueller Julien Schueller Julien Schueller Julien Schueller Julien Schueller Kevin Davies Kevin Davies kikocorreoso kikocorreoso +Leeonadoh Lennart Fricke Lennart Fricke Levi Kilcher Levi Kilcher Martin Fitzpatrick Martin Fitzpatrick +Matthew Emmett +Matthew Emmett Matthias Bussonnier Bussonnier Matthias Matthias Bussonnier Matthias BUSSONNIER Michael Droettboom Michael Droettboom Michael Droettboom Michael Droettboom +Michiel de Hoon Michiel de Hoon Michiel de Hoon Michiel de Hoon Michiel de Hoon Michiel de Hoon Michiel de Hoon Michiel de Hoon Michiel de Hoon MinRK Min RK +MinRK Nelle Varoquaux Varoquaux Nic Eggert Nic Eggert Nic Eggert Nic Eggert Nicolas P. Rougier Nicolas Rougier +OceanWolf +Patrick Chen Paul Ivanov Paul Ivanov Per Parker Per Per Parker solvents @@ -52,10 +69,13 @@ Phil Elson pelson Phil Elson Phil Elson Phil Elson Phil Elson Scott Lasley selasley +Simon Cross sohero sohero +Stefan van der Walt switham switham Thomas A Caswell Thomas A Caswell Thomas A Caswell Thomas A Caswell Thomas A Caswell Thomas A Caswell <“tcaswell@gmail.com”> +Werner F Bruhin Yunfei Yang Yunfei Yang Yunfei Yang Yunfei Yang From 4c55187e44a4983278d6fcfdea9a147586e8d551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jouni=20K=2E=20Sepp=C3=A4nen?= Date: Sat, 31 Oct 2015 11:33:00 +0200 Subject: [PATCH 2/3] Simplify .mailmap It is not usually necessary to have lines like Firstname Lastname Different Spelling Firstname Lastname Firstname Lastname They can be replaced with Firstname Lastname Firstname Lastname except perhaps if the email address doesn't identify a person uniquely, such as with . See https://www.kernel.org/pub/software/scm/git/docs/git-shortlog.html --- .mailmap | 80 +++++++++++++++++++++++++------------------------------- 1 file changed, 36 insertions(+), 44 deletions(-) diff --git a/.mailmap b/.mailmap index e10de06889db..400106690a98 100644 --- a/.mailmap +++ b/.mailmap @@ -1,74 +1,66 @@ -Andrew Dawson Andrew Dawson -anykraus anykraus +Andrew Dawson +anykraus Ariel Hernán Curiale -Ben Cohen Ben Cohen -Ben Root Benjamin Root +Ben Cohen +Ben Root Casper van der Wel -Christoph Gohlke cgohlke -Christoph Gohlke C. Gohlke -Cimarron Mittelsteadt Cimarron +Christoph Gohlke +Cimarron Mittelsteadt +Daniel Hyams Daniel Hyams Daniel Hyams -Daniel Hyams dhyams David Kua endolith -Eric Dill Eric Dill -Erik Bray Erik M. Bray +Eric Dill +Erik Bray Eric Ma Eric Ma Francesco Montesano montefra Jaime Fernandez Jake Vanderplas -Jake Vanderplas Jake Vanderplas -Jake Vanderplas Jake Vanderplas -James R. Evans James Evans +Jake Vanderplas +Jake Vanderplas +James R. Evans Jeff Lutgen -Jeffrey Bingham Jeff Bingham -Jens Hedegaard Nielsen Jens Hedegaard Nielsen -Jens Hedegaard Nielsen Jens H Nielsen -Jens Hedegaard Nielsen Jens H. Nielsen -Jens Hedegaard Nielsen Jens H. Nielsen -John Hunter jdh2358 +Jeffrey Bingham +Jens Hedegaard Nielsen +Jens Hedegaard Nielsen +John Hunter Jorrit Wronski Jouni K. Seppänen -Julien Schueller jschueller -Julien Schueller Julien Schueller -Julien Schueller Julien Schueller -Kevin Davies Kevin Davies -kikocorreoso kikocorreoso +Julien Schueller +Julien Schueller +Kevin Davies +kikocorreoso Leeonadoh -Lennart Fricke Lennart Fricke -Levi Kilcher Levi Kilcher -Martin Fitzpatrick Martin Fitzpatrick +Lennart Fricke +Levi Kilcher +Martin Fitzpatrick Matthew Emmett Matthew Emmett -Matthias Bussonnier Bussonnier Matthias -Matthias Bussonnier Matthias BUSSONNIER -Michael Droettboom Michael Droettboom +Matthias Bussonnier +Michael Droettboom Michael Droettboom Michael Droettboom Michiel de Hoon Michiel de Hoon Michiel de Hoon Michiel de Hoon Michiel de Hoon Michiel de Hoon Michiel de Hoon Michiel de Hoon Michiel de Hoon -MinRK Min RK MinRK -Nelle Varoquaux Varoquaux +MinRK Min RK +Nelle Varoquaux Nic Eggert Nic Eggert Nic Eggert Nic Eggert -Nicolas P. Rougier Nicolas Rougier +Nicolas P. Rougier OceanWolf Patrick Chen -Paul Ivanov Paul Ivanov -Per Parker Per -Per Parker solvents -Peter Würtz Peter Würtz -Peter Würtz pwuertz -Peter Würtz pwuertz -Phil Elson pelson -Phil Elson pelson -Phil Elson Phil Elson -Phil Elson Phil Elson -Scott Lasley selasley +Paul Ivanov +Per Parker +Peter Würtz +Peter Würtz +Phil Elson +Phil Elson +Phil Elson +Scott Lasley Simon Cross sohero sohero Stefan van der Walt From fbf59588cc44a7cbebf8a62c263f06e3e36d7ec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jouni=20K=2E=20Sepp=C3=A4nen?= Date: Sat, 31 Oct 2015 22:18:53 +0200 Subject: [PATCH 3/3] Fix Jeff Lutgen's email address --- .mailmap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 400106690a98..b0df2fbcd0c7 100644 --- a/.mailmap +++ b/.mailmap @@ -20,7 +20,7 @@ Jake Vanderplas Jake Vanderplas Jake Vanderplas James R. Evans -Jeff Lutgen +Jeff Lutgen Jeffrey Bingham Jens Hedegaard Nielsen Jens Hedegaard Nielsen