From e7c96558239a5dec4c4c90efd5dfaa7c38e84154 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 17 Sep 2016 22:26:35 -0400 Subject: [PATCH 1/4] Backport .mailmap changes from master. --- .mailmap | 95 ++++++++++++++++++++++++++++++++------------------------ 1 file changed, 55 insertions(+), 40 deletions(-) diff --git a/.mailmap b/.mailmap index 662cd2fdf1d6..049f6a49f1a3 100644 --- a/.mailmap +++ b/.mailmap @@ -1,62 +1,77 @@ Adrien F. Vincent -Andrew Dawson Andrew Dawson -anykraus anykraus -Ben Cohen Ben Cohen +Andrew Dawson +anykraus +Ariel Hernán Curiale +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 -Daniel Hyams dhyams -Eric Dill Eric Dill -Erik Bray Erik M. Bray +David Kua +endolith +Eric Dill +Erik Bray +Eric Ma +Eric Ma Francesco Montesano montefra -Jake Vanderplas Jake Vanderplas -Jake Vanderplas Jake Vanderplas -James R. Evans James Evans -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 -Julien Schueller jschueller -Julien Schueller Julien Schueller -Julien Schueller Julien Schueller -Kevin Davies Kevin Davies -kikocorreoso kikocorreoso -Lennart Fricke Lennart Fricke -Levi Kilcher Levi Kilcher -Martin Fitzpatrick Martin Fitzpatrick -Matthias Bussonnier Bussonnier Matthias -Matthias Bussonnier Matthias BUSSONNIER -Michael Droettboom Michael Droettboom +Jaime Fernandez +Jake Vanderplas +Jake Vanderplas +Jake Vanderplas +James R. Evans +Jeff Lutgen +Jeffrey Bingham +Jens Hedegaard Nielsen +Jens Hedegaard Nielsen +John Hunter +Jorrit Wronski +Joseph Fox-Rabinovitz Mad Physicist +Joseph Fox-Rabinovitz Joseph Fox-Rabinovitz +Jouni K. Seppänen +Julien Schueller +Julien Schueller +Kevin Davies +kikocorreoso +Leeonadoh +Lennart Fricke +Levi Kilcher +Martin Fitzpatrick +Matthew Emmett +Matthew Emmett +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 MinRK Min RK -Nelle Varoquaux Varoquaux +Nelle Varoquaux Nic Eggert Nic Eggert Nic Eggert Nic Eggert -Nicolas P. Rougier Nicolas Rougier -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 +Nicolas P. Rougier +OceanWolf +Patrick Chen +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 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 fc3df8914ad5e897fa2101ce802e097c75d84cc9 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 18 Sep 2016 01:17:50 -0400 Subject: [PATCH 2/4] Split names in .mailmap for easier viewing. --- .mailmap | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/.mailmap b/.mailmap index 049f6a49f1a3..c2daae499a2d 100644 --- a/.mailmap +++ b/.mailmap @@ -1,77 +1,131 @@ Adrien F. Vincent + Andrew Dawson + anykraus + Ariel Hernán Curiale + 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 + David Kua + endolith + Eric Dill + Erik Bray + Eric Ma Eric Ma + Francesco Montesano montefra + Jaime Fernandez + Jake Vanderplas Jake Vanderplas Jake Vanderplas + James R. Evans + Jeff Lutgen + Jeffrey Bingham + Jens Hedegaard Nielsen Jens Hedegaard Nielsen + John Hunter + Jorrit Wronski + Joseph Fox-Rabinovitz Mad Physicist Joseph Fox-Rabinovitz Joseph Fox-Rabinovitz + Jouni K. Seppänen + Julien Schueller Julien Schueller + Kevin Davies + kikocorreoso + Leeonadoh + Lennart Fricke + Levi Kilcher + Martin Fitzpatrick + Matthew Emmett Matthew Emmett + 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 MinRK Min RK + Nelle Varoquaux + Nic Eggert Nic Eggert Nic Eggert Nic Eggert + Nicolas P. Rougier + OceanWolf + Patrick Chen + 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 + 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 53603be1928f49c76dd91684c4cf0a8cc740c148 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 18 Sep 2016 01:00:15 -0400 Subject: [PATCH 3/4] Add some new entries to .mailmap. --- .mailmap | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/.mailmap b/.mailmap index c2daae499a2d..ae1b8ecf108a 100644 --- a/.mailmap +++ b/.mailmap @@ -1,4 +1,7 @@ +Adam Ortiz + Adrien F. Vincent +Adrien F. Vincent Andrew Dawson @@ -10,6 +13,9 @@ Ben Cohen Ben Root Benjamin Root +Benjamin Congdon +Benjamin Congdon bcongdon + Casper van der Wel Christoph Gohlke cgohlke @@ -17,11 +23,15 @@ Christoph Gohlke C. Gohlke Cimarron Mittelsteadt Cimarron +DanHickstein + Daniel Hyams Daniel Hyams Daniel Hyams David Kua +Devashish Deshpande + endolith Eric Dill @@ -31,8 +41,20 @@ Erik Bray Eric Ma Eric Ma +Filipe + +Florian LB + Francesco Montesano montefra +hannah + +Hans Moritz Günther + +J. Goutin JGoutin + +Jack Kelly Jack (aka Daniel) Kelly + Jaime Fernandez Jake Vanderplas @@ -64,12 +86,19 @@ Kevin Davies kikocorreoso +Klara Gerlei +Klara Gerlei klaragerlei + +Kristen M. Thyng + Leeonadoh Lennart Fricke Levi Kilcher +Lion Krischer + Martin Fitzpatrick Matthew Emmett @@ -77,6 +106,9 @@ Matthew Emmett Matthias Bussonnier +matthias +matthias + Michael Droettboom Michael Droettboom Michael Droettboom @@ -89,6 +121,8 @@ Michiel de Hoon Michiel de Hoon MinRK Min RK +Moritz Beyreuther + Nelle Varoquaux Nic Eggert Nic Eggert @@ -100,6 +134,9 @@ OceanWolf Patrick Chen +Paul Hobson +Paul Hobson vagrant + Paul Ivanov Per Parker @@ -111,10 +148,18 @@ Phil Elson Phil Elson Phil Elson +productivememberofsociety666 none + +rasbt + +RyanPan + Scott Lasley Simon Cross +Slav + sohero sohero Stefan van der Walt From 08372609f6e1b0d313dfbcd487d330c5b45c5413 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 28 Sep 2016 19:34:34 -0400 Subject: [PATCH 4/4] Update .mailmap based on feedback. --- .mailmap | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/.mailmap b/.mailmap index ae1b8ecf108a..f638116e560f 100644 --- a/.mailmap +++ b/.mailmap @@ -23,7 +23,9 @@ Christoph Gohlke C. Gohlke Cimarron Mittelsteadt Cimarron -DanHickstein +Conner R. Phillips + +Dan Hickstein Daniel Hyams Daniel Hyams Daniel Hyams @@ -41,9 +43,9 @@ Erik Bray Eric Ma Eric Ma -Filipe +Filipe Fernandes -Florian LB +Florian Le Bourdais Francesco Montesano montefra @@ -53,7 +55,8 @@ Hans Moritz Günther J. Goutin JGoutin -Jack Kelly Jack (aka Daniel) Kelly +Jack Kelly +Jack Kelly Jaime Fernandez @@ -97,7 +100,7 @@ Lennart Fricke Levi Kilcher -Lion Krischer +Lion Krischer Martin Fitzpatrick @@ -106,8 +109,8 @@ Matthew Emmett Matthias Bussonnier -matthias -matthias +Matthias Lüthi +Matthias Lüthi Michael Droettboom Michael Droettboom Michael Droettboom @@ -121,8 +124,6 @@ Michiel de Hoon Michiel de Hoon MinRK Min RK -Moritz Beyreuther - Nelle Varoquaux Nic Eggert Nic Eggert @@ -150,15 +151,16 @@ Phil Elson productivememberofsociety666 none -rasbt - RyanPan Scott Lasley +Sebastian Raschka +Sebastian Raschka + Simon Cross -Slav +Slav Basharov sohero sohero @@ -170,6 +172,8 @@ Thomas A Caswell Thomas A Caswell Thomas A Caswell Thomas A Caswell Thomas A Caswell Thomas A Caswell <“tcaswell@gmail.com”> +Trish Gillett-Kawamoto + Werner F Bruhin Yunfei Yang Yunfei Yang