forked from numpy/numpy
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request numpy#6142 from charris/update-mailmap
MAINT: Update names in .mailmap for the 1.10 release.
- Loading branch information
Showing
1 changed file
with
104 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,111 @@ | ||
| # Prevent git from showing duplicate names with commands like "git shortlog" | ||
| # # See the manpage of git-shortlog for details. | ||
| # # The syntax is: | ||
| # # Name that should be used <email that should be used> Bad name <bad email> | ||
| # # | ||
| # # You can skip Bad name if it is the same as the one that should be used, and is unique. | ||
| # # | ||
| # # This file is up-to-date if the command git log --format="%aN <%aE>" | sort -u | ||
| # # gives no duplicates. | ||
| # See the manpage of git-shortlog for details. | ||
| # The syntax is: | ||
| # Name that should be used <email that should be used> Bad name <bad email> | ||
| # | ||
| # You can skip Bad name if it is the same as the one that should be used, and is unique. | ||
| # | ||
| # This file is up-to-date if the command git log --format="%aN <%aE>" | sort -u | ||
| # gives no duplicates. | ||
|
|
||
| Nathaniel J. Smith <[email protected]> njsmith <[email protected]> | ||
| Ralf Gommers <[email protected]> rgommers <[email protected]> | ||
| Christoph Gohlke <[email protected]> cgholke <?@?> | ||
| Aaron Baecker <abaecker@localhost> abaecker <abaecker@localhost> | ||
| Abdul Muneer <[email protected]> abdulmuneer <[email protected]> | ||
| Albert Jornet Puig <[email protected]> jurnix <[email protected]> | ||
| Alex Griffing <[email protected]> alex <[email protected]> | ||
| Alex Griffing <[email protected]> argriffing <[email protected]> | ||
| Alex Griffing <[email protected]> argriffing <[email protected]> | ||
| Alex Griffing <[email protected]> argriffing <[email protected]> | ||
| Alexander Belopolsky <[email protected]> Alexander Belopolsky <[email protected]> | ||
| Amir Sarabadani <[email protected]> amir <[email protected]> | ||
| Anne Archibald <[email protected]> aarchiba <[email protected]> | ||
| Anže Starič <[email protected]> astaric <[email protected]> | ||
| Aron Ahmadia <[email protected]> ahmadia <[email protected]> | ||
| Behzad Nouri <[email protected]> behzad nouri <[email protected]> | ||
| Benjamin Root <[email protected]> Ben Root <[email protected]> | ||
| Benjamin Root <[email protected]> weathergod <?@?> | ||
| Brett R Murphy <[email protected]> brettrmurphy <[email protected]> | ||
| Bryan Van de Ven <[email protected]> Bryan Van de Ven <[email protected]> | ||
| Bryan Van de Ven <[email protected]> Bryan Van de Ven <[email protected]> | ||
| Carl Kleffner <[email protected]> carlkl <[email protected]> | ||
| Chris Burns <chris.burns@localhost> chris.burns <chris.burns@localhost> | ||
| Christoph Gohlke <[email protected]> Christolph Gohlke <[email protected]> | ||
| Christoph Gohlke <[email protected]> cgholke <?@?> | ||
| Christoph Gohlke <[email protected]> cgohlke <[email protected]> | ||
| Ondřej Čertík <[email protected]> Ondrej Certik <[email protected]> | ||
| Christopher Hanley <[email protected]> chanley <[email protected]> | ||
| Daniel J Farrell <[email protected]> danieljfarrell <[email protected]> | ||
| Daniel Müllner <Daniel Müllner [email protected]> Daniel <[email protected]> | ||
| Daniel Müllner <Daniel Müllner [email protected]> dmuellner <Daniel Müllner [email protected]> | ||
| Daniel da Silva <[email protected]> Daniel da Silva <[email protected]> | ||
| Daniel da Silva <[email protected]> Daniel da Silva <[email protected]> | ||
| David Huard <[email protected]> dhuard <dhuard@localhost> | ||
| David M Cooke <cookedm@localhost> cookedm <cookedm@localhost> | ||
| David Ochoa <[email protected]> ochoadavid <[email protected]> | ||
| Derek Homeier <[email protected]> Derek Homeier <[email protected]> | ||
| Derek Homeier <[email protected]> Derek Homeir <[email protected]> | ||
| Derek Homeier <[email protected]> Derek Homier <[email protected]> | ||
| Egor Zindy <[email protected]> zindy <[email protected]> | ||
| Ernest N. Mamikonyan <[email protected]> mamikony <[email protected]> | ||
| Evgeny Toder <[email protected]> eltjpm <[email protected]> | ||
| Fernando Perez <[email protected]> Fernando Perez <[email protected]> | ||
| Gael Varoquaux <[email protected]> GaelVaroquaux <[email protected]> | ||
| Giuseppe Venturini <[email protected]> ggventurini <[email protected]> | ||
| Han Genuit <[email protected]> 87 <[email protected]> | ||
| Han Genuit <[email protected]> Han <[email protected]> | ||
| Han Genuit <[email protected]> [email protected] <[email protected]> | ||
| Hanno Klemm <[email protected]> hklemm <[email protected]> | ||
| Jaime Fernandez <[email protected]> Jaime <[email protected]> | ||
| Jaime Fernandez <[email protected]> Jaime Fernandez <[email protected]> | ||
| Jaime Fernandez <[email protected]> jaimefrio <[email protected]> | ||
| Jarrod Millman <[email protected]> Jarrod Millman <[email protected]> | ||
| Jay Bourque <[email protected]> jayvius <[email protected]> | ||
| Jerome Kelleher <[email protected]> jeromekelleher <[email protected]> | ||
| Johannes Schönberger <[email protected]> Johannes Schönberger <[email protected]> | ||
| Julian Taylor <[email protected]> Julian Taylor <[email protected]> | ||
| Julian Taylor <[email protected]> Julian Taylor <[email protected]> | ||
| Lars Buitinck <[email protected]> Lars Buitinck <[email protected]> | ||
| Lars Buitinck <[email protected]> Lars Buitinck <[email protected]> | ||
| Luis Pedro Coelho <[email protected]> Luis Pedro Coelho <[email protected]> | ||
| Mark DePristo <[email protected]> markdepristo <[email protected]> | ||
| Mark Wiebe <[email protected]> Mark <[email protected]> | ||
| Mark Wiebe <[email protected]> Mark Wiebe <[email protected]> | ||
| Mark Wiebe <[email protected]> Mark Wiebe <[email protected]> | ||
| Mark Wiebe <[email protected]> Mark Wiebe <mwiebe@georg.(none)> | ||
| Han Genuit <[email protected]> Han <[email protected]> | ||
| Martin Goodson <[email protected]> martingoodson <[email protected]> | ||
| Martin Teichmann <[email protected]> Martin Teichmann <[email protected]> | ||
| Mattheus Ueckermann <[email protected]> empeeu <[email protected]> | ||
| Michael Droettboom <[email protected]> mdroe <mdroe@localhost> | ||
| Nathaniel J. Smith <[email protected]> njsmith <[email protected]> | ||
| Nicolas Scheffer <[email protected]> Nicolas Scheffer <[email protected]> | ||
| Ondřej Čertík <[email protected]> Ondrej Certik <[email protected]> | ||
| Pat Miller <patmiller@localhost> patmiller <patmiller@localhost> | ||
| Paul Ivanov <[email protected]> Paul Ivanov <paul.ivanov@local> | ||
| Paul Jacobson <[email protected]> hpaulj <[email protected]> | ||
| Pearu Peterson <[email protected]> Pearu Peterson <pearu@pearu-laptop.(none)> | ||
| Peter J Cock <[email protected]> peterjc <[email protected]> | ||
| Pierre GM <[email protected]> pierregm <pierregm@localhost> | ||
| Pierre GM <[email protected]> pierregm <[email protected]> | ||
| Prabhu Ramachandran <prabhu@localhost> prabhu <prabhu@localhost> | ||
| Ralf Gommers <[email protected]> Ralf Gommers <[email protected]> | ||
| Ralf Gommers <[email protected]> rgommers <[email protected]> | ||
| Ritta Narita <[email protected]> RittaNarita <[email protected]> | ||
| Robert Kern <[email protected]> Robert Kern <[email protected]> | ||
| Robert LU <[email protected]> RobberPhex <[email protected]> | ||
| Russell Hewett <[email protected]> rhewett <[email protected]> | ||
| Ryan Blakemore <[email protected]> ryanblak <[email protected]> | ||
| Sam Preston <[email protected]> jspreston <[email protected]> | ||
| Saullo Giovani <[email protected]> saullogiovani <[email protected]> | ||
| Sebastian Berg <[email protected]> seberg <[email protected]> | ||
| Stefan van der Walt <[email protected]> Stefan van der Walt <[email protected]> | ||
| Stefan van der Walt <[email protected]> Stefan van der Walt <[email protected]> | ||
| Thomas A Caswell <[email protected]> Thomas A Caswell <[email protected]> | ||
| Thomas A Caswell <[email protected]> Thomas A Caswell <[email protected]> | ||
| Tim Cera <[email protected]> tim cera <[email protected]> | ||
| Tom Poole <[email protected]> tpoole <[email protected]> | ||
| Travis Oliphant <[email protected]> Travis E. Oliphant <[email protected]> | ||
| Travis Oliphant <[email protected]> Travis Oliphant <[email protected]> | ||
| Valentin Haenel <[email protected]> Valentin Haenel <[email protected]> | ||
| Warren Weckesser <[email protected]> Warren Weckesser <[email protected]> | ||
| Wendell Smith <[email protected]> Wendell Smith <[email protected]> | ||
| William Spotz <[email protected]@localhost> [email protected] <[email protected]@localhost> | ||
| Åsmund Hjulstad <[email protected]> Åsmund Hjulstad <[email protected]> | ||
| Óscar Villellas Guillén <[email protected]> ovillellas <[email protected]> |