8000 Merge pull request #6142 from charris/update-mailmap · numpy/numpy@a39d355 · GitHub
[go: up one dir, main page]

Skip to content

Commit a39d355

Browse files
committed
Merge pull request #6142 from charris/update-mailmap
MAINT: Update names in .mailmap for the 1.10 release.
2 parents dfdfdc5 + ddd66c2 commit a39d355

File tree

1 file changed

+104
-13
lines changed

1 file changed

+104
-13
lines changed

.mailmap

Lines changed: 104 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,111 @@
11
# Prevent git from showing duplicate names with commands like "git shortlog"
2-
# # See the manpage of git-shortlog for details.
3-
# # The syntax is:
4-
# # Name that should be used <email that should be used> Bad name <bad email>
5-
# #
6-
# # You can skip Bad name if it is the same as the one that should be used, and is unique.
7-
# #
8-
# # This file is up-to-date if the command git log --format="%aN <%aE>" | sort -u
9-
# # gives no duplicates.
2+
# See the manpage of git-shortlog for details.
3+
# The syntax is:
4+
# Name that should be used <email that should be used> Bad name <bad email>
5+
#
6+
# You can skip Bad name if it is the same as the one that should be used, and is unique.
7+
#
8+
# This file is up-to-date if the command git log --format="%aN <%aE>" | sort -u
9+
# gives no duplicates.
1010

11-
Nathaniel J. Smith <njs@pobox.com> njsmith <njs@pobox.com>
12-
Ralf Gommers <ralf.gommers@googlemail.com> rgommers <ralf.gommers@googlemail.com>
13-
Christoph Gohlke <cgohlke@uci.edu> cgholke <?@?>
11+
Aaron Baecker <abaecker@localhost> abaecker <abaecker@localhost>
12+
Abdul Muneer <abdulmuneer@gmail.com> abdulmuneer <abdulmuneer@gmail.com>
13+
Albert Jornet Puig <albert.jornet@ic3.cat> jurnix <albert.jornet@ic3.cat>
14+
Alex Griffing <argriffi@ncsu.edu> alex <argriffi@ncsu.edu>
15+
Alex Griffing <argriffi@ncsu.edu> argriffing <argriffi@ncsu.edu>
16+
Alex Griffing <argriffi@ncsu.edu> argriffing <argriffing@gmail.com>
17+
Alex Griffing <argriffi@ncsu.edu> argriffing <argriffing@users.noreply.github.com>
18+
Alexander Belopolsky <abalkin@enlnt.com> Alexander Belopolsky <a@enlnt.com>
19+
Amir Sarabadani <ladsgroup@gmail.com> amir <ladsgroup@gmail.com>
20+
Anne Archibald <peridot.faceted@gmail.com> aarchiba <peridot.faceted@gmail.com>
21+
Anže Starič <anze.staric@gmail.com> astaric <anze.staric@gmail.com>
22+
Aron Ahmadia <aron@ahmadia.net> ahmadia <aron@ahmadia.net>
23+
Behzad Nouri <behzadnouri@gmail.com> behzad nouri <behzadnouri@gmail.com>
24+
Benjamin Root <ben.v.root@gmail.com> Ben Root <ben.v.root@gmail.com>
25+
Benjamin Root <ben.v.root@gmail.com> weathergod <?@?>
26+
Brett R Murphy <bmurphy@enthought.com> brettrmurphy <bmurphy@enthought.com>
27+
Bryan Van de Ven <bryanv@continuum.io> Bryan Van de Ven <bryan@Laptop-3.local>
28+
Bryan Van de Ven <bryanv@continuum.io> Bryan Van de Ven <bryan@laptop.local>
29+
Carl Kleffner <cmkleffner@gmail.com> carlkl <cmkleffner@gmail.com>
30+
Chris Burns <chris.burns@localhost> chris.burns <chris.burns@localhost>
1431
Christoph Gohlke <cgohlke@uci.edu> Christolph Gohlke <cgohlke@uci.edu>
32+
Christoph Gohlke <cgohlke@uci.edu> cgholke <?@?>
1533
Christoph Gohlke <cgohlke@uci.edu> cgohlke <cgohlke@uci.edu>
16-
Ondřej Čertík <ondrej.certik@gmail.com> Ondrej Certik <ondrej.certik@gmail.com>
34+
Christopher Hanley <chanley@gmail.com> chanley <chanley@gmail.com>
35+
Daniel J Farrell <danieljfarrel@me.com> danieljfarrell <danieljfarrel@me.com>
36+
Daniel Müllner <Daniel Müllner muellner@math.stanford.edu> Daniel <muellner@localhost.localdomain>
37+
Daniel Müllner <Daniel Müllner muellner@math.stanford.edu> dmuellner <Daniel Müllner muellner@math.stanford.edu>
38+
Daniel da Silva <mail@danieldasilva.org> Daniel da Silva <daniel@meltingwax.net>
39+
Daniel da Silva <mail@danieldasilva.org> Daniel da Silva <var.mail.daniel@gmail.com>
40+
David Huard <david.huard@gmail.com> dhuard <dhuard@localhost>
41+
David M Cooke <cookedm@localhost> cookedm <cookedm@localhost>
42+
David Ochoa <ochoadavid@gmail.com> ochoadavid <ochoadavid@gmail.com>
43+
Derek Homeier <derek@astro.physik.uni-goettingen.de> Derek Homeier <dhomeie@gwdg.de>
44+
Derek Homeier <derek@astro.physik.uni-goettingen.de> Derek Homeir <derek@astro.phsik.uni-goettingen.de>
45+
Derek Homeier <derek@astro.physik.uni-goettingen.de> Derek Homier <derek@astro.physik.uni-goettingen.de>
46+
Egor Zindy <ezindy@gmail.com> zindy <ezindy@gmail.com>
47+
Ernest N. Mamikonyan <ernest.mamikonyan@sig.com> mamikony <ernest.mamikonyan@sig.com>
48+
Evgeny Toder <evgeny.toder@jpmorgan.com> eltjpm <evgeny.toder@jpmorgan.com>
49+
Fernando Perez <Fernando.Perez@berkeley.edu> Fernando Perez <fperez@fperez.org>
50+
Gael Varoquaux <gael.varoquaux@normalesup.org> GaelVaroquaux <gael.varoquaux@normalesup.org>
51+
Giuseppe Venturini <ggventurini@users.noreply.github.com> ggventurini <ggventurini@users.noreply.github.com>
52+
Han Genuit <hangenuit@gmail.com> 87 <hangenuit@gmail.com>
53+
Han Genuit <hangenuit@gmail.com> Han <hangenuit@gmail.com>
54+
Han Genuit <hangenuit@gmail.com> hangenuit@gmail.com <hangenuit@gmail.com>
55+
Hanno Klemm <hanno.klemm@maerskoil.com> hklemm <hanno.klemm@maerskoil.com>
56+
Jaime Fernandez <jaime.frio@gmail.com> Jaime <jaime.frio@gmail.com>
57+
Jaime Fernandez <jaime.frio@gmail.com> Jaime Fernandez <jaime.fernandez@hp.com>
58+
Jaime Fernandez <jaime.frio@gmail.com> jaimefrio <jaime.frio@gmail.com>
59+
Jarrod Millman <millman@berkeley.edu> Jarrod Millman <jarrod.millman@gmail.com>
60+
Jay Bourque <jay.bourque@continuum.io> jayvius <jay.bourque@continuum.io>
61+
Jerome Kelleher <jerome.kelleher@ed.ac.uk> jeromekelleher <jerome.kelleher@ed.ac.uk>
62+
Johannes Schönberger <hannesschoenberger@gmail.com> Johannes Schönberger <jschoenberger@demuc.de>
63+
Julian Taylor <juliantaylor108@gmail.com> Julian Taylor <jtaylor.debian@googlemail.com>
64+
Julian Taylor <juliantaylor108@gmail.com> Julian Taylor <juliantaylor108@googlemail.com>
65+
Lars Buitinck <larsmans@gmail.com> Lars Buitinck <L.J.Buitinck@uva.nl>
66+
Lars Buitinck <larsmans@gmail.com> Lars Buitinck <l.buitinck@esciencecenter.nl>
67+
Luis Pedro Coelho <luis@luispedro.org> Luis Pedro Coelho <lpc@cmu.edu>
68+
Mark DePristo <mdepristo@synapdx.com> markdepristo <mdepristo@synapdx.com>
1769
Mark Wiebe <mwwiebe@gmail.com> Mark <mwwiebe@gmail.com>
70+
Mark Wiebe <mwwiebe@gmail.com> Mark Wiebe <mwiebe@continuum.io>
1871
Mark Wiebe <mwwiebe@gmail.com> Mark Wiebe <mwiebe@enthought.com>
1972
Mark Wiebe <mwwiebe@gmail.com> Mark Wiebe <mwiebe@georg.(none)>
20-
Han Genuit <hangenuit@gmail.com> Han <hangenuit@gmail.com>
73+
Martin Goodson <martingoodson@gmail.com> martingoodson <martingoodson@gmail.com>
74+
Martin Teichmann <martin.teichmann@xfel.eu> Martin Teichmann <lkb.teichmann@gmail.com>
75+
Mattheus Ueckermann <empeeu@yahoo.com> empeeu <empeeu@yahoo.com>
76+
Michael Droettboom <mdboom@gmail.com> mdroe <mdroe@localhost>
77+
Nathaniel J. Smith <njs@pobox.com> njsmith <njs@pobox.com>
78+
Nicolas Scheffer <nicolas.scheffer@sri.com> Nicolas Scheffer <scheffer@speech.sri.com>
79+
Ondřej Čertík <ondrej.certik@gmail.com> Ondrej Certik <ondrej.certik@gmail.com>
80+
Pat Miller <patmiller@localhost> patmiller <patmiller@localhost>
81+
Paul Ivanov <pi@berkeley.edu> Paul Ivanov <paul.ivanov@local>
82+
Paul Jacobson <hpj3@myuw.net> hpaulj <hpj3@myuw.net>
83+
Pearu Peterson <pearu.peterson@gmail.com> Pearu Peterson <pearu@pearu-laptop.(none)>
84+
Peter J Cock <p.j.a.cock@googlemail.com> peterjc <p.j.a.cock@googlemail.com>
85+
Pierre GM <pierregmcode@gmail.com> pierregm <pierregm@localhost>
86+
Pierre GM <pierregmcode@gmail.com> pierregm <pierregmcode@gmail.com>
87+
Prabhu Ramachandran <prabhu@localhost> prabhu <prabhu@localhost>
88+
Ralf Gommers <ralf.gommers@gmail.com> Ralf Gommers <ralf.gommers@googlemail.com>
89+
Ralf Gommers <ralf.gommers@gmail.com> rgommers <ralf.gommers@googlemail.com>
90+
Ritta Narita <narittan@gmail.com> RittaNarita <narittan@gmail.com>
91+
Robert Kern <rkern@enthought.com> Robert Kern <robert.kern@gmail.com>
92+
Robert LU <robberphex@gmail.com> RobberPhex <robberphex@gmail.com>
93+
Russell Hewett <rhewett@mit.edu> rhewett <rhewett@mit.edu>
94+
Ryan Blakemore <rbtnet@gmail.com> ryanblak <rbtnet@gmail.com>
95+
Sam Preston <j.sam.preston@gmail.com> jspreston <j.sam.preston@gmail.com>
96+
Saullo Giovani <saullogiovani@gmail.com> saullogiovani <saullogiovani@gmail.com>
97+
Sebastian Berg <sebastian@sipsolutions.net> seberg <sebastian@sipsolutions.net>
98+
Stefan van der Walt <stefanv@berkeley.edu> Stefan van der Walt <sjvdwalt@gmail.com>
99+
Stefan van der Walt <stefanv@berkeley.edu> Stefan van der Walt <stefan@sun.ac.za>
100+
Thomas A Caswell <tcaswell@gmail.com> Thomas A Caswell <tcaswell@bnl.gov>
101+
Thomas A Caswell <tcaswell@gmail.com> Thomas A Caswell <tcaswell@bnl.gov>
102+
Tim Cera <tim@cerazone.net> tim cera <tcera@sjrwmd.com>
103+
Tom Poole <t.b.poole@gmail.com> tpoole <t.b.poole@gmail.com>
104+
Travis Oliphant <travis@continuum.io> Travis E. Oliphant <teoliphant@gmail.com>
105+
Travis Oliphant <travis@continuum.io> Travis Oliphant <oliphant@enthought.com>
106+
Valentin Haenel <valentin@haenel.co> Valentin Haenel <valentin.haenel@gmx.de>
107+
Warren Weckesser <warren.weckesser@enthought.com> Warren Weckesser <warren.weckesser@gmail.com>
108+
Wendell Smith <wendellwsmith@gmail.com> Wendell Smith <wackywendell@gmail.com>
109+
William Spotz <wfspotz@sandia.gov@localhost> wfspotz@sandia.gov <wfspotz@sandia.gov@localhost>
110+
Åsmund Hjulstad <ahju@statoil.com> Åsmund Hjulstad <asmund@hjulstad.com>
111+
Óscar Villellas Guillén <oscar.villellas@continuum.io> ovillellas <oscar.villellas@continuum.io>

0 commit comments

Comments
 (0)
0