Skip to content
Merged
Changes from 1 commit
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
Prev Previous commit
Update .mailmap based on feedback.
  • Loading branch information
QuLogic committed Oct 1, 2016
commit 08372609f6e1b0d313dfbcd487d330c5b45c5413
28 changes: 16 additions & 12 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ Christoph Gohlke <cgohlke@uci.edu> C. Gohlke <cgohlke@uci.edu>

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

DanHickstein <danhickstein@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)>
Expand All @@ -41,9 +43,9 @@ 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 <ocefpaf@gmail.com>
Filipe Fernandes <ocefpaf@gmail.com>

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

Francesco Montesano <franz.bergesund@gmail.com> montefra <franz.bergesund@gmail.com>

Expand All @@ -53,7 +55,8 @@ 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-list@xlk.org.uk> Jack (aka Daniel) Kelly <daniel.kelly10@imperial.ac.uk>
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>

Expand Down Expand Up @@ -97,7 +100,7 @@ Lennart Fricke <lennart@die-frickes.eu> <lennart.fricke@kabelmail.de>

Levi Kilcher <levi.kilcher@nrel.gov>

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

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

Expand All @@ -106,8 +109,8 @@ Matthew Emmett <memmett@gmail.com> <memmett@unc.edu>

Matthias Bussonnier <bussonniermatthias@gmail.com>

matthias <maluethi@protonmail.ch>
matthias <maluethi@protonmail.ch> <matthias.luethi@lhep.unibe.ch>
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>
Expand All @@ -121,8 +124,6 @@ Michiel de Hoon <mjldehoon@yahoo.com> Michiel de Hoon <mdehoon@tkx294.genome.gsc
MinRK <benjaminrk@gmail.com>
MinRK <benjaminrk@gmail.com> Min RK <minrk@kerbin.local>

Moritz Beyreuther <random.seed@web.de>

Nelle Varoquaux <nelle.varoquaux@gmail.com>

Nic Eggert <nic.eggert@gmail.com> Nic Eggert <nic@eggert.pw>
Expand Down Expand Up @@ -150,15 +151,16 @@ Phil Elson <pelson.pub@gmail.com> <philipelson@gmail.com>

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

rasbt <mail@sebastianraschka.com> <se.raschka@me.com>

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 <slavbacharov@gmail.com>
Slav Basharov <slavbacharov@gmail.com>

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

Expand All @@ -170,6 +172,8 @@ 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)>
Expand Down