aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorStefan Kangas2022-09-28 14:50:24 +0200
committerStefan Kangas2022-09-28 15:16:57 +0200
commitc54a64491f3944078d8da1e0cc81da7565a22de8 (patch)
tree3e50308bd5a16eb147a8fcc808015abc6dd0ccd2 /.mailmap
parentf9a072c59298127eaa0d75fafdfc404b08d1483d (diff)
downloademacs-c54a64491f3944078d8da1e0cc81da7565a22de8.tar.gz
emacs-c54a64491f3944078d8da1e0cc81da7565a22de8.zip
Add .mailmap for proper git log output
This file is used to fix a few misspelled names in various git listings (e.g., "git log"). This can be used to fix incorrect attribution, poor display, or names showing up more than once. It also allows updating an old email addresses to a new one. See "man git-shortlog" for more information on the format. * .mailmap: New file.
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap146
1 files changed, 146 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000000..f231fb5cc72
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,146 @@
1#
2# This list is used to fix a few misspelled names in various git
3# listings (e.g., "git log"). This can be used to fix incorrect
4# attribution, poor display, or names showing up more than once.
5# It also allows updating an old email addresses to a new one.
6#
7# See "man git-shortlog" for more information on the format.
8#
9# Keep file sorted using `M-x sort-lines'.
10#
11Alan Third <alan@idiocy.org>
12Alan Third <alan@idiocy.org> <alan@breton-build.holly.idiocy.org>
13Alexander Gramiak <agrambot@gmail.com>
14Amin Bandali <bandali@gnu.org> <mab@gnu.org>
15Andrea Corallo <akrl@sdf.org>
16Andrea Corallo <akrl@sdf.org> <akrl@sdf.com>
17Andrea Corallo <akrl@sdf.org> <andcor03@e112547.nice.arm.com>
18Andrea Corallo <akrl@sdf.org> <andrea_corallo@yahoo.it>
19Andrew G Cohen <cohen@andy.bu.edu>
20Andrew G Cohen <cohen@andy.bu.edu> <cohen@bu.edu>
21Arash Esbati <arash@gnu.org> <arash.esbati@gmail.com>
22Arash Esbati <arash@gnu.org> <esbati@gmx.de>
23Artur Malabarba <bruce.connor.am@gmail.com> <am12548@it055607.users.bris.ac.uk>
24Bastien Guerry <bzg@gnu.org>
25Carlos Pita <carlosjosepita@gmail.com>
26Chong Yidong <cyd@gnu.org> <cyd@stupidchicken.com>
27Christoph Scholtes <cschol2112@gmail.com>
28Christoph Scholtes <cschol2112@gmail.com> <cschol2112@googlemail.com>
29Clément Pit-Claudel <clement.pitclaudel@live.com>
30Clément Pit-Claudel <clement.pitclaudel@live.com> <clement.pit@gmail.com>
31Courtney Bane <emacs-bugs-7626@cbane.org>
32Dan Nicolaescu <dann@ics.uci.edu> <dann@gnu.org>
33Dan Nicolaescu <dann@ics.uci.edu> <done@ece.arizona.edu>
34Daniel Colascione <dancol@dancol.org> <dan.colascione@gmail.com>
35David Abrahams <dave@boostpro.com>
36David M. Koppelman <koppel@ece.lsu.edu>
37Deniz Dogan <deniz@dogan.se> <deniz.a.m.dogan@gmail.com>
38Dick R. Chiang <dick.r.chiang@gmail.com>
39Earl Hyatt <ej32u@protonmail.com>
40Earl Hyatt <ej32u@protonmail.com> <okamsn@protonmail.com>
41Edward M. Reingold <reingold@emr.cs.iit.edu>
42Eli Zaretskii <eliz@gnu.org> <eliz@is.elta.co.il>
43Emilio C. Lopes <eclig@gmx.net>
44Enami Tsugutomo <tsugutomo.enami@jp.sony.com>
45Era Eriksson <era+emacs@iki.fi> <era+emacsbugs@iki.fi>
46Eric S. Raymond <esr@thyrsus.com> <esr@snark.thyrsus.com>
47Etienne Prud’homme <e.e.f.prudhomme@gmail.com>
48Fabián Ezequiel Gallina <fgallina@gnu.org> <fgallina@cuca>
49Francis Litterio <flitterio@gmail.com>
50Gabor Vida <vidagabor@gmail.com>
51Gerd Möllmann <gerd@gnu.org>
52Gerd Möllmann <gerd@gnu.org> <gerd.moellmann@gmail.com>
53Glenn Morris <rgm@gnu.org>
54Glenn Morris <rgm@gnu.org> <rgm@fencepost>
55Glenn Morris <rgm@gnu.org> <rgm@stanford.edu>
56Gnus developers <ding@gnus.org> <ding@gnus.org.noreply>
57Gregory Heytings <gregory@heytings.org> <ghe@sdf.org>
58Grégoire Jadi <daimrod@gmail.com>
59Ian Dunn <dunni@gnu.org>
60Jan Djärv <jan.h.d@swipnet.se>
61Jan Djärv <jan.h.d@swipnet.se> <jhd@f20.localdomain>
62Jason Rumney <jasonr@gnu.org> <jasonr@wanchan>
63Jens Lechtenbörger <jens.lechtenboerger@fsfe.org>
64Jim Blandy <jimb@red-bean.com> <jimb@redhat.com>
65Jimmy Aguilar Mena <spacibba@aol.com>
66Joakim Verona <joakim@verona.se>
67Joakim Verona <joakim@verona.se> <root@exodia.verona.se>
68John Wiegley <johnw@newartisans.com> <jwiegley@gmail.com>
69Jose A. Ortega Ruiz <jao@gnu.org>
70João Távora <joaotavora@gmail.com>
71Juri Linkov <juri@linkov.net> <juri@jurta.org>
72Jérémy Compostella <jeremy.compostella@gmail.com>
73Jürgen Hötzel <juergen@archlinux.org>
74Karl Fogel <kfogel@red-bean.com> <karl.fogel@canonical.com>
75Kaushal Modi <kaushal.modi@gmail.com>
76Kelvin White <kwhite@gnu.org>
77Kenichi Handa <handa@gnu.org>
78Kenichi Handa <handa@gnu.org> <handa@etlken>
79Kenichi Handa <handa@gnu.org> <handa@m17n.org>
80Kenjiro Nakayama <nakayamakenjiro@gmail.com>
81Károly Lőrentey <lorentey@elte.hu>
82Lars Ingebrigtsen <larsi@gnus.org>
83Lars Ingebrigtsen <larsi@gnus.org> <larsi@emkay.local>
84Lars Ingebrigtsen <larsi@gnus.org> <larsi@openbsd6.gnus.org>
85Lars Ingebrigtsen <larsi@gnus.org> <larsi@quimbies.gnus.org>
86Lars Ingebrigtsen <larsi@gnus.org> <larsi@stories.gnus.org>
87Lin Sun <lin.sun@zoom.us>
88Ludovic Courtès <ludo@gnu.org>
89Martin Rudalics <rudalics@gmx.at>
90Martin Rudalics <rudalics@gmx.at> <“rudalics@gmx.at”>
91Matt Armstrong <matt@rfc20.org> <marmstrong@google.com>
92Matt Armstrong <matt@rfc20.org> <matt@mdeb>
93Mattias Engdegård <mattiase@acm.org>
94Maxim Nikulin <manikulin@gmail.com>
95Michael Albinus <michael.albinus@gmx.de> <albinus@detlef>
96Michalis V <mvar.40k@gmail.com>
97Miha Rihtaršič <miha@kamnitnik.top>
98Nick Drozd <nicholasdrozd@gmail.com>
99Nicolas Petton <nicolas@petton.fr> <petton.nicolas@gmail.com>
100Nitish Chandra <nitishchandrachinta@gmail.com>
101Noam Postavsky <npostavs@gmail.com> <npostavs@users.sourceforge.net>
102Noam Postavsky <npostavs@gmail.com> <npostavs@users.sourceforget.net>
103Paul Eggert <eggert@cs.ucla.edu> <eggert@Penguin.CS.UCLA.EDU>
104Paul Eggert <eggert@cs.ucla.edu> <eggert@day>
105Paul Eggert <eggert@cs.ucla.edu> <eggert@twinsun.com>
106Paul Eggert <eggert@cs.ucla.edu> <eggert@union>
107Peter J. Weisberg <pj@irregularexpressions.net>
108Peter Oliver <p.d.oliver@mavit.org.uk> <bzr@mavit.org.uk>
109Peter Oliver <p.d.oliver@mavit.org.uk> <git@mavit.org.uk>
110Philip Kaludercic <philipk@posteo.net>
111Philip Kaludercic <philipk@posteo.net> <philip.kaludercic@fau.de>
112Philip Kaludercic <philipk@posteo.net> <philip@warpmail.net>
113Philipp Stephani <phst@google.com>
114Philipp Stephani <phst@google.com> Philipp Stephani <p.stephani2@gmail.com>
115Phillip Lord <phillip.lord@russet.org.uk> <phillip.lord@newcastle.ac.uk>
116Pierre Lorenzon <devel@pollock-nageoire.net>
117Pieter van Oostrum <pieter@vanoostrum.org> <pieter-l@vanoostrum.org>
118Pip Cet <pipcet@gmail.com>
119Przemysław Wojnowski <esperanto@cumego.com>
120Rasmus <rasmus@gmx.us>
121Richard M. Stallman <rms@gnu.org>
122Robert J. Chassell <bob@gnu.org> <bob@rattlesnake.com>
123Ronnie Schnell <ronnie@driver-aces.com>
124Ryan C. Thompson <rct@thompsonclan.org>
125Simen Heggestøyl <simenheg@gmail.com>
126Simen Heggestøyl <simenheg@gmail.com> <simenheg@ifi.uio.no>
127Simon Josefsson <simon@josefsson.org> <jas@extundo.com>
128Stefan Kangas <stefankangas@gmail.com> <stefan@marxist.se>
129Stefan Monnier <monnier@iro.umontreal.ca> <monnier@IRO.UMontreal.CA>
130Tassilo Horn <tsdh@gnu.org> <tassilo@member.fsf.org>
131Ted Zlatanov <tzz@lifelogs.com>
132Thien-Thi Nguyen <ttn@gnu.org> <ttn@gnuvola.org>
133Thierry Volpiatto <thievol@posteo.net> <thierry.volpiatto@gmail.com>
134Tino Calancha <ccalancha@suse.com> <f92capac@gmail.com>
135Tino Calancha <ccalancha@suse.com> <tino.calancha@gmail.com>
136Tom Tromey <tom@tromey.com> <tromey@redhat.com>
137Ulf Jasper <ulf.jasper@web.de> <ulf@uthinkpad>
138Ulrich Müller <ulm@gentoo.org>
139Werner Lemberg <wl@gnu.org>
140Wolfgang Scherer <wolfgang.scherer@gmx.de> <Wolfgang.Scherer@gmx.de>
141Xi Lu <lx@shellcodes.org>
142Xue Fuqiao <xfq.free@gmail.com> <xfq@gnu.org>
143Óscar Fuentes <ofv@wanadoo.es>
144İ. Göktuğ Kayaalp <self@gkayaalp.com>
145Łukasz Stelmach <stlman@poczta.fm> <l.stelmach@samsung.com>
146Łukasz Stelmach <stlman@poczta.fm> <lukasz.stelmach@iem.pw.edu.pl>