Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
198 changes: 158 additions & 40 deletions .mailmap
Original file line number Diff line number Diff line change
@@ -1,62 +1,180 @@
Adam Ortiz <adam.ortiz@utoronto.ca>

Adrien F. Vincent <vincent.adrien@gmail.com>
Andrew Dawson <ajdawson@acm.org> Andrew Dawson <dawson@atm.ox.ac.uk>
anykraus <kraus@mpip-mainz.mpg.de> anykraus <anykraus@users.noreply.github.com>
Ben Cohen <bj.cohen19@gmail.com> Ben Cohen <ben@cohen-family.org>
Adrien F. Vincent <vincent.adrien@gmail.com> <adrien.vincent@u-psud.fr>

Andrew Dawson <ajdawson@acm.org> <dawson@atm.ox.ac.uk>

anykraus <kraus@mpip-mainz.mpg.de> <anykraus@users.noreply.github.com>

Ariel Hernán Curiale <curiale@gmail.com>

Ben Cohen <bj.cohen19@gmail.com> <ben@cohen-family.org>

Ben Root <ben.v.root@gmail.com> Benjamin Root <ben.v.root@gmail.com>

Benjamin Congdon <bencongdon96@gmail.com>
Benjamin Congdon <bencongdon96@gmail.com> bcongdon <bcongdo2@illinois.edu>

Casper van der Wel <caspervdw@gmail.com>

Christoph Gohlke <cgohlke@uci.edu> cgohlke <cgohlke@uci.edu>
Christoph Gohlke <cgohlke@uci.edu> C. Gohlke <cgohlke@uci.edu>

Cimarron Mittelsteadt <cimarronm@gmail.com> Cimarron <cimarronm@gmail.com>

Conner R. Phillips <conner.r.phillips@gmail.com> <conner.r.phillips.com>

Dan Hickstein <danhickstein@gmail.com>

Daniel Hyams <dhyams@gmail.com>
Daniel Hyams <dhyams@gmail.com> Daniel Hyams <dhyams@gitdev.(none)>
Daniel Hyams <dhyams@gmail.com> dhyams <dhyams@gmail.com>
Eric Dill <thedizzle@gmail.com> Eric Dill <edill@bnl.gov>
Erik Bray <erik.m.bray@gmail.com> Erik M. Bray <embray@stsci.edu>

David Kua <david@kua.io> <david.kua@mail.utoronto.ca>

Devashish Deshpande <ashu.9412@gmail.com>

endolith <endolith@gmail.com>

Eric Dill <thedizzle@gmail.com> <edill@bnl.gov>

Erik Bray <erik.m.bray@gmail.com> <embray@stsci.edu>

Eric Ma <ericmajinglong@gmail.com> <ericmjl@Erics-MacBook-Pro.local>
Eric Ma <ericmajinglong@gmail.com> <ericmjl@users.noreply.github.com>

Filipe Fernandes <ocefpaf@gmail.com>

Florian Le Bourdais <florian.s.lebourdais@gmail.com>

Francesco Montesano <franz.bergesund@gmail.com> montefra <franz.bergesund@gmail.com>
Jake Vanderplas <jakevdp@gmail.com> Jake Vanderplas <jakevdp@yahoo.com>
Jake Vanderplas <jakevdp@gmail.com> Jake Vanderplas <vanderplas@astro.washington.edu>
James R. Evans <jrevans1@earthlink.net> James Evans <jrevans1@earthlink.net>
Jeffrey Bingham <bingjeff@gmail.com> Jeff Bingham <bingjeff@gmail.com>
Jens Hedegaard Nielsen <jenshnielsen@gmail.com> Jens Hedegaard Nielsen <jens.nielsen@ucl.ac.uk>
Jens Hedegaard Nielsen <jenshnielsen@gmail.com> Jens H Nielsen <jenshnielsen@gmail.com>
Jens Hedegaard Nielsen <jenshnielsen@gmail.com> Jens H. Nielsen <jenshnielsen@gmail.com>
Jens Hedegaard Nielsen <jenshnielsen@gmail.com> Jens H. Nielsen <jens.nielsen@ucl.ac.uk>
John Hunter <jdh2358@gmail.com> jdh2358 <jdh2358@gmail.com>
Jouni K. Seppänen <jks@iki.fi> Jouni K. Seppänen <jks@iki.fi>
Julien Schueller <julien.schueller@gmail.com> jschueller <schueller@porsche-l64.phimeca.lan>
Julien Schueller <julien.schueller@gmail.com> Julien Schueller <schueller@bx-l64.phimeca.lan>
Julien Schueller <julien.schueller@gmail.com> Julien Schueller <schueller@porsche-l64.phimeca.lan>
Kevin Davies <kdavies4@gmail.com> Kevin Davies <daviesk24@yahoo.com>
kikocorreoso <kikocorreoso@gmail.com> kikocorreoso <kikocorreoso@users.noreply.github.com>
Lennart Fricke <lennart@die-frickes.eu> Lennart Fricke <lennart.fricke@kabelmail.de>
Levi Kilcher <levi.kilcher@nrel.gov> Levi Kilcher <Levi.Kilcher@nrel.gov>
Martin Fitzpatrick <martin.fitzpatrick@gmail.com> Martin Fitzpatrick <mfitzp@abl.es>
Matthias Bussonnier <bussonniermatthias@gmail.com> Bussonnier Matthias <bussonniermatthias@gmail.com>
Matthias Bussonnier <bussonniermatthias@gmail.com> Matthias BUSSONNIER <bussonniermatthias@gmail.com>
Michael Droettboom <mdboom@gmail.com> Michael Droettboom <mdroe@stsci.edu>

hannah <story645@gmail.com>

Hans Moritz Günther <moritz.guenther@gmx.de>

J. Goutin <JGoutin@users.noreply.github.com> JGoutin <ginnungagap@free.fr>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, could you change my line to:
J.Goutin JGoutin@users.noreply.github.com
Thanks

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without the space?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keep the space.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure I understand what you want different then?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just want removing the second mail address.

Thanks.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can leave it out if you don't want them associated, but note the second address already appears in commits alongside your username; this line ensures they're treated as the same person.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is OK for me. Thanks.

Jack Kelly <jack.kelly@imperial.ac.uk> <daniel.kelly10@imperial.ac.uk>
Jack Kelly <jack.kelly@imperial.ac.uk> <jack-list@xlk.org.uk>

Jaime Fernandez <jaime.frio@gmail.com>

Jake Vanderplas <jakevdp@gmail.com>
Jake Vanderplas <jakevdp@gmail.com> <jakevdp@yahoo.com>
Jake Vanderplas <jakevdp@gmail.com> <vanderplas@astro.washington.edu>

James R. Evans <jrevans1@earthlink.net>

Jeff Lutgen <jlutgen@gmail.com> <jlutgen@users.noreply.github.com>

Jeffrey Bingham <bingjeff@gmail.com>

Jens Hedegaard Nielsen <jenshnielsen@gmail.com>
Jens Hedegaard Nielsen <jenshnielsen@gmail.com> <jens.nielsen@ucl.ac.uk>

John Hunter <jdh2358@gmail.com>

Jorrit Wronski <jowr@mek.dtu.dk>

Joseph Fox-Rabinovitz <jfoxrabinovitz@gmail.com> Mad Physicist <madphysicist@users.noreply.github.com>
Joseph Fox-Rabinovitz <jfoxrabinovitz@gmail.com> Joseph Fox-Rabinovitz <joseph.r.fox-rabinovitz@nasa.gov>

Jouni K. Seppänen <jks@iki.fi>

Julien Schueller <julien.schueller@gmail.com> <schueller@porsche-l64.phimeca.lan>
Julien Schueller <julien.schueller@gmail.com> <schueller@bx-l64.phimeca.lan>

Kevin Davies <kdavies4@gmail.com> <daviesk24@yahoo.com>

kikocorreoso <kikocorreoso@gmail.com> <kikocorreoso@users.noreply.github.com>

Klara Gerlei <klarizsofi@gmail.com>
Klara Gerlei <klarizsofi@gmail.com> klaragerlei <s1466507@sms.ed.ac.uk>

Kristen M. Thyng <kthyng@gmail.com>

Leeonadoh <leo.sunpeng.li@gmail.com>

Lennart Fricke <lennart@die-frickes.eu> <lennart.fricke@kabelmail.de>

Levi Kilcher <levi.kilcher@nrel.gov>

Lion Krischer <lion.krischer@gmail.com> <krischer@geophysik.uni-muenchen.de>

Martin Fitzpatrick <martin.fitzpatrick@gmail.com> <mfitzp@abl.es>

Matthew Emmett <memmett@gmail.com>
Matthew Emmett <memmett@gmail.com> <memmett@unc.edu>

Matthias Bussonnier <bussonniermatthias@gmail.com>

Matthias Lüthi <maluethi@protonmail.ch>
Matthias Lüthi <maluethi@protonmail.ch> <matthias.luethi@lhep.unibe.ch>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Michael Droettboom <mdboom@gmail.com> <mdroe@stsci.edu>
Michael Droettboom <mdboom@gmail.com> Michael Droettboom <mdboom@debian-vm>

Michiel de Hoon <mjldehoon@yahoo.com>
Michiel de Hoon <mjldehoon@yahoo.com> Michiel de Hoon <mdehoon@mad002s-MacBook-Air.local>
Michiel de Hoon <mjldehoon@yahoo.com> Michiel de Hoon <mdehoon@michiel-de-hoons-computer.local>
Michiel de Hoon <mjldehoon@yahoo.com> Michiel de Hoon <mdehoon@Michiels-MacBook-Pro.local>
Michiel de Hoon <mjldehoon@yahoo.com> Michiel de Hoon <mdehoon@tkx294.genome.gsc.riken.jp>

MinRK <benjaminrk@gmail.com>
MinRK <benjaminrk@gmail.com> Min RK <minrk@kerbin.local>
Nelle Varoquaux <nelle.varoquaux@gmail.com> Varoquaux <nelle.varoquaux@gmail.com>

Nelle Varoquaux <nelle.varoquaux@gmail.com>

Nic Eggert <nic.eggert@gmail.com> Nic Eggert <nic@eggert.pw>
Nic Eggert <nic.eggert@gmail.com> Nic Eggert <nse23@cornell.edu>
Nicolas P. Rougier <Nicolas.Rougier@inria.fr> Nicolas Rougier <Nicolas.Rougier@inria.fr>
Paul Ivanov <pivanov314@gmail.com> Paul Ivanov <pi@berkeley.edu>
Per Parker <wisalam@live.com> Per <wisalam@live.com>
Per Parker <wisalam@live.com> solvents <wisalam@live.com>
Peter Würtz <pwuertz@gmail.com> Peter Würtz <pwuertz@googlemail.com>
Peter Würtz <pwuertz@gmail.com> pwuertz <pwuertz@gmail.com>
Peter Würtz <pwuertz@gmail.com> pwuertz <pwuertz@googlemail.com>
Phil Elson <pelson.pub@gmail.com> pelson <pelson.pub@gmail.com>
Phil Elson <pelson.pub@gmail.com> pelson <philipelson@hotmail.com>
Phil Elson <pelson.pub@gmail.com> Phil Elson <philipelson@gmail.com>
Phil Elson <pelson.pub@gmail.com> Phil Elson <philipelson@hotmail.com>
Scott Lasley <selasley@me.com> selasley <selasley@me.com>

Nicolas P. Rougier <Nicolas.Rougier@inria.fr>

OceanWolf <juichenieder-tigger@yahoo.co.uk>

Patrick Chen <pat.chen@mail.utoronto.ca>

Paul Hobson <pmhobson@gmail.com>
Paul Hobson <pmhobson@gmail.com> vagrant <vagrant@precise32.(none)>

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure what the vagrant part is. Did I push a commit from a VM along time ago?

Otherwise, this looks good to me.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, #2768. It is a rather generic name though, so we'd have to be careful no-one else uses it, or maybe not bother fixing that one commit's attribution.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oof. Sorry about that.

I'm ok with that commit not getting attributed to me.

The main thing I'm concerned about is that y'all (the core team) have as few headaches as possible. I'm on board with whatever you chose to do wit this.


Paul Ivanov <pivanov314@gmail.com> <pi@berkeley.edu>

Per Parker <wisalam@live.com>

Peter Würtz <pwuertz@gmail.com>
Peter Würtz <pwuertz@gmail.com> <pwuertz@googlemail.com>

Phil Elson <pelson.pub@gmail.com>
Phil Elson <pelson.pub@gmail.com> <philipelson@hotmail.com>
Phil Elson <pelson.pub@gmail.com> <philipelson@gmail.com>

productivememberofsociety666 <productivememberofsociety666@sol.fr.am> none <none@example.net>

RyanPan <ryanbelt1993129@hotmail.com>

Scott Lasley <selasley@me.com>

Sebastian Raschka <mail@sebastianraschka.com>
Sebastian Raschka <mail@sebastianraschka.com> <se.raschka@me.com>

Simon Cross <hodgestar+github@gmail.com> <hodgestar@gmail.com>

Slav Basharov <slavbacharov@gmail.com>

sohero <herosgq@gmail.com> sohero <ivip@tom.com>

Stefan van der Walt <stefanv@berkeley.edu> <stefan@sun.ac.za>

switham <github@mac-guyver.com> switham <switham_github@mac-guyver.com>

Thomas A Caswell <tcaswell@gmail.com> Thomas A Caswell <tcaswell@bnl.gov>
Thomas A Caswell <tcaswell@gmail.com> Thomas A Caswell <tcaswell@uchicago.edu>
Thomas A Caswell <tcaswell@gmail.com> Thomas A Caswell <“tcaswell@gmail.com”>

Trish Gillett-Kawamoto <trish.gillett@shopify.com> <discardthree@gmail.com>

Werner F Bruhin <wernerfbd@gmx.ch>

Yunfei Yang <yangyunf@iits-b473-20053.(none)> Yunfei Yang <yangyunf@iits-b473-20057.(none)>
Yunfei Yang <yangyunf@iits-b473-20053.(none)> Yunfei Yang <yangyunf@iits-b473-20061.(none)>