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