Skip to content

Commit e0ab1ec

Browse files
Nicolas PitreLinus Torvalds
authored andcommitted
[PATCH] add .mailmap for proper git-shortlog output
This list was built into the git-shortlog tool and has been removed in the latest version. It should be maintained separately so this is what this patch does. A couple more entries were added to the original list as well. Signed-off-by: Nicolas Pitre <nico@cam.org> Acked-by: Junio C Hamano <junkio@cox.net> Cc: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 895a39a commit e0ab1ec

File tree

1 file changed

+96
-0
lines changed

1 file changed

+96
-0
lines changed

.mailmap

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
#
2+
# This list is used by git-shortlog to fix a few botched name translations
3+
# in the git archive, either because the author's full name was messed up
4+
# and/or not always written the same way, making contributions from the
5+
# same person appearing not to be so or badly displayed.
6+
#
7+
# repo-abbrev: /pub/scm/linux/kernel/git/
8+
#
9+
10+
Aaron Durbin <adurbin@google.com>
11+
Adam Oldham <oldhamca@gmail.com>
12+
Adam Radford <aradford@gmail.com>
13+
Adrian Bunk <bunk@stusta.de>
14+
Alan Cox <alan@lxorguk.ukuu.org.uk>
15+
Alan Cox <root@hraefn.swansea.linux.org.uk>
16+
Aleksey Gorelov <aleksey_gorelov@phoenix.com>
17+
Al Viro <viro@ftp.linux.org.uk>
18+
Al Viro <viro@zenIV.linux.org.uk>
19+
Andreas Herrmann <aherrman@de.ibm.com>
20+
Andrew Morton <akpm@osdl.org>
21+
Andrew Vasquez <andrew.vasquez@qlogic.com>
22+
Andy Adamson <andros@citi.umich.edu>
23+
Arnaud Patard <arnaud.patard@rtp-net.org>
24+
Arnd Bergmann <arnd@arndb.de>
25+
Axel Dyks <xl@xlsigned.net>
26+
Ben Gardner <bgardner@wabtec.com>
27+
Ben M Cahill <ben.m.cahill@intel.com>
28+
Björn Steinbrink <B.Steinbrink@gmx.de>
29+
Brian Avery <b.avery@hp.com>
30+
Brian King <brking@us.ibm.com>
31+
Christoph Hellwig <hch@lst.de>
32+
Corey Minyard <minyard@acm.org>
33+
David Brownell <david-b@pacbell.net>
34+
David Woodhouse <dwmw2@shinybook.infradead.org>
35+
Domen Puncer <domen@coderock.org>
36+
Douglas Gilbert <dougg@torque.net>
37+
Ed L. Cashin <ecashin@coraid.com>
38+
Evgeniy Polyakov <johnpol@2ka.mipt.ru>
39+
Felipe W Damasio <felipewd@terra.com.br>
40+
Felix Kuhling <fxkuehl@gmx.de>
41+
Felix Moeller <felix@derklecks.de>
42+
Filipe Lautert <filipe@icewall.org>
43+
Franck Bui-Huu <vagabon.xyz@gmail.com>
44+
Frank Zago <fzago@systemfabricworks.com>
45+
Greg Kroah-Hartman <greg@echidna.(none)>
46+
Greg Kroah-Hartman <gregkh@suse.de>
47+
Greg Kroah-Hartman <greg@kroah.com>
48+
Henk Vergonet <Henk.Vergonet@gmail.com>
49+
Henrik Kretzschmar <henne@nachtwindheim.de>
50+
Herbert Xu <herbert@gondor.apana.org.au>
51+
Jacob Shin <Jacob.Shin@amd.com>
52+
James Bottomley <jejb@mulgrave.(none)>
53+
James Bottomley <jejb@titanic.il.steeleye.com>
54+
James E Wilson <wilson@specifix.com>
55+
James Ketrenos <jketreno@io.(none)>
56+
Jean Tourrilhes <jt@hpl.hp.com>
57+
Jeff Garzik <jgarzik@pretzel.yyz.us>
58+
Jens Axboe <axboe@suse.de>
59+
Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
60+
John Stultz <johnstul@us.ibm.com>
61+
Juha Yrjola <at solidboot.com>
62+
Juha Yrjola <juha.yrjola@nokia.com>
63+
Juha Yrjola <juha.yrjola@solidboot.com>
64+
Kay Sievers <kay.sievers@vrfy.org>
65+
Kenneth W Chen <kenneth.w.chen@intel.com>
66+
Koushik <raghavendra.koushik@neterion.com>
67+
Leonid I Ananiev <leonid.i.ananiev@intel.com>
68+
Linas Vepstas <linas@austin.ibm.com>
69+
Matthieu CASTET <castet.matthieu@free.fr>
70+
Michel Dänzer <michel@tungstengraphics.com>
71+
Mitesh shah <mshah@teja.com>
72+
Morten Welinder <terra@gnome.org>
73+
Morten Welinder <welinder@anemone.rentec.com>
74+
Morten Welinder <welinder@darter.rentec.com>
75+
Morten Welinder <welinder@troll.com>
76+
Nguyen Anh Quynh <aquynh@gmail.com>
77+
Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
78+
Patrick Mochel <mochel@digitalimplant.org>
79+
Peter A Jonsson <pj@ludd.ltu.se>
80+
Praveen BP <praveenbp@ti.com>
81+
Rajesh Shah <rajesh.shah@intel.com>
82+
Ralf Baechle <ralf@linux-mips.org>
83+
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
84+
Rémi Denis-Courmont <rdenis@simphalempin.com>
85+
Rudolf Marek <R.Marek@sh.cvut.cz>
86+
Rui Saraiva <rmps@joel.ist.utl.pt>
87+
Sachin P Sant <ssant@in.ibm.com>
88+
Sam Ravnborg <sam@mars.ravnborg.org>
89+
Simon Kelley <simon@thekelleys.org.uk>
90+
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
91+
Stephen Hemminger <shemminger@osdl.org>
92+
Tejun Heo <htejun@gmail.com>
93+
Thomas Graf <tgraf@suug.ch>
94+
Tony Luck <tony.luck@intel.com>
95+
Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
96+
Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

0 commit comments

Comments
 (0)