Compiz

Merge compiz:mitya57/mailmap into compiz:master

  1. Git
  2. lp:compiz
  3. mitya57/mailmap
  4. Merge into master
Proposed by Dmitry Shachnev
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: a5de844caec56a00635e8bf096370c1ec80b8507
Merged at revision: 3552c1f096b4120ccb34de39354bdebbd1ff9d12
Proposed branch: compiz:mitya57/mailmap
Merge into: compiz:master
Diff against target: 123 lines (+117/-0)
1 file modified
.mailmap (+117/-0)
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Alberts Muktupāvels Pending
Compiz Maintainers Pending
Review via email: mp+363198@code.launchpad.net

Description of the change

Add .mailmap file to make ‘git shortlog -se’ output much cleaner. That command will be used to regenerate AUTHORS file.

It is partially based on .AUTHORS.sed from commit 6e8fe9b8abc82942.

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Thanks

review: Approve
Revision history for this message
Dmitry Shachnev (mitya57) wrote :

Cherry-picked as https://git.launchpad.net/compiz/commit/?id=3552c1f096b4120ccb34de39354bdebbd1ff9d12.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/.mailmap b/.mailmap
2new file mode 100644
3index 0000000..6c445bd
4--- /dev/null
5+++ b/.mailmap
6@@ -0,0 +1,117 @@
7+Adel Gadllah <adel.gadllah@gmail.com> <drago01@gmail.com>
8+Alan Griffiths <alan.griffiths@canonical.com> <alan@octopull.co.uk>
9+Andrea Azzarone <azzaronea@gmail.com> <aazarone@gmail.com>
10+Andrea Azzarone <azzaronea@gmail.com> Andrea Azzarone andrea.azzarone@canonical.com <>
11+Bellegarde Cedric <gnumdk@gmail.com> <gnumdk@gmail.com>
12+Bellegarde Cedric <gnumdk@gmail.com> <gnumdk@puffy.homelinux.org>
13+Brian Nguyen <bnguyen@nvidia.com> Bryan Nguyen
14+BryanFRitt <BryanFRitt@Hotmail.com> <BryanFRitt@HotMail.com>
15+C-F Language team <i18n@opencompositing.org> C-F language team
16+Christopher James Halse Rogers <chris@cooperteam.net> <chris@Burninator.>
17+Christopher Williams <crdlb@compiz-fusion.org> <christopherw@verizon.net>
18+Compiz Fusion l10n team <i18n@opencompositing.org> <i18n@opencompositing.org>
19+Daniel van Vugt <daniel.van.vugt@canonical.com> Daniel van Vugt <>
20+Daniel van Vugt <daniel.van.vugt@canonical.com> <vanvugt@gmail.com>
21+Danny Baumann <dannybaumann@web.de> <daba@mobilrechner.localdomain>
22+Danny Baumann <dannybaumann@web.de> <daba@noname.>
23+Danny Baumann <dannybaumann@web.de> <daba@rechenknecht.peppercon.de>
24+Danny Baumann <dannybaumann@web.de> <maniac>
25+Danny Baumann <dannybaumann@web.de> <maniac@opencompositing.fr.nf>
26+Danny Baumann <dannybaumann@web.de> <maniac@opencompositing.org>
27+Dan Winship <danw@novell.com> <danw@twelve-monkeys.boston.ximian.com>
28+David Reveman <davidr@novell.com> <c99drn@cs.umu.se>
29+David Reveman <davidr@novell.com> <david@ion.>
30+Dennis Kasprzyk <onestone@opencompositing.org> <onestone>
31+Dennis Kasprzyk <onestone@opencompositing.org> <onestone@beryl-project.org>
32+Dennis Kasprzyk <onestone@opencompositing.org> <onestone@compiz-fusion.org>
33+Dennis Kasprzyk <onestone@opencompositing.org> <onestone@compiz.org>
34+Dennis Kasprzyk <onestone@opencompositing.org> <onestone@de35.org>
35+Didier Roche <didier.roche@canonical.com> <didrocks@ubuntu.com>
36+Diogo Ferreira <diogo@underdev.org> <defer@localhost.localdomain>
37+Dominique Leuenberger <dominique@leuenberger.net> <dimstar@opensuse.org>
38+Dominique Leuenberger <dominique@leuenberger.net> <dominique@messiah.leuenberger.net>
39+Eduardo Gurgel Pinho <edgurgel@gmail.com> <eduardo@mad4.>
40+Eduardo Gurgel Pinho <edgurgel@gmail.com> <eduardo@mad4.Chagas>
41+Erkin Bahceci <erkinbah@gmail.com> <erkin@flux.>
42+Guillaume Seguin <guillaume@segu.in> <ixce@ed3n.>
43+Guillaume Seguin <guillaume@segu.in> <ixce@ed3n-m.>
44+Guillaume Seguin <guillaume@segu.in> <ixcemix@gmail.com>
45+Hu Kang <stevenhooke11@gmail.com> Hu Kang stevenhooke11@gmail.com <>
46+James Jones <jajones@nvidia.com> <jajones@jatest.nvidia.com>
47+Jigish Gohil <cyberorg@prime.cyberorg.info> <cyberorg@opensuse.org>
48+Jigish Gohil <cyberorg@prime.cyberorg.info> <cyberorg@opensuse.orgname=JigishGohil>
49+Jigish Gohil <cyberorg@prime.cyberorg.info> <cyberorg@prime.>
50+Jigish Gohil <cyberorg@prime.cyberorg.info> <root@prime.cyberorg.info>
51+Joel Bosveld <joel.bosveld@gmail.com> <Joel.Bosveld@gmail.com>
52+Kevin Lange <klange@ogunderground.com> Kevin Lange <>
53+Kristian Høgsberg <krh@redhat.com> <krh@bitplanet.net>
54+Kristian Lyngstøl <kristian@bohemians.org> <kristian@albus.>
55+Kristian Lyngstøl <kristian@bohemians.org> <kristian@beryl-project.org>
56+Kristian Lyngstøl <kristian@bohemians.org> <kristian@bohemians.org>
57+Kristian Lyngstøl <kristian@bohemians.org> <kristian@de35.org>
58+Kristian Lyngstøl <kristian@bohemians.org> <kristian@linpro.no>
59+Kristian Lyngstøl <kristian@bohemians.org> <kristian@nihilus.>
60+Kristian Lyngstøl <kristian@bohemians.org> <kristian@opencompositing.org>
61+Kristian Lyngstøl <kristian@bohemians.org> <kristian@yoda.Lyngstol.net>
62+Kristopher Ives <kristopher.ives@gmail.com> <kris@leetbook2.>
63+ksamak <ksamak@riseup.net> <ksamak@ksalaptop>
64+Lubos Lunak <llunak@suse.cz> <llunak@novell.com>
65+Łukasz 'sil2100' Zemczak <lukasz.zemczak@canonical.com> Łukasz Zemczak <>
66+Marco Trevisan (Treviño) <mail@3v1n0.net> <trevi55@gmail.com>
67+Martin Wimpress <code@flexion.org> <martin.wimpress@ubuntu.com>
68+Matija Skala <mskala@gmx.com> <mskala@mail386.com>
69+MC Return <mc.return@gmx.net> <mcr2010@mcr2010-HP-Compaq-dc7700-Convertible-Minitower>
70+Michael Vogt <mvo@ubuntu.com> <mvogt@acm.org>
71+Michail Bitzes <bitzesmichail@gmail.com> <bitzesmichail>
72+Michail Bitzes <bitzesmichail@gmail.com> Michail Bitzes <>
73+Mike Dransfield <mike@blueroot.co.uk> <mike@blueroot.co.uk>
74+Mikkel Kamstrup Erlandsen <mikkel.kamstrup@gmail.com> <mikkel.kamstrup@canonical.com>
75+Nicholas Brugier <gandalfn@club-internet.fr> gandalfn
76+Patrick Niklaus <marex@opencompositing.org> <marex@beryl-project.org>
77+Patrick Niklaus <marex@opencompositing.org> <marex@compiz-fusion.org>
78+Patrick Niklaus <marex@opencompositing.org> <patrick@dark-desktop.>
79+Patrick Niklaus <marex@opencompositing.org> <patrick.niklaus@googlemail.com>
80+Quinn Storm <livinglatexkali@gmail.com> <quinn@darter.>
81+Quinn Storm <livinglatexkali@gmail.com> <quinn@darter.myhome.westell.com>
82+Quinn Storm <livinglatexkali@gmail.com> <quinn@de35.org>
83+Quinn Storm <livinglatexkali@gmail.com> <quinn@quinn-laptop.>
84+Robert Carr <racarr@canonical.com> <racarr>
85+Robert Carr <racarr@canonical.com> <racarr@de35.org>
86+Robert Carr <racarr@canonical.com> <racarr@gorbie.>
87+Robert Carr <racarr@canonical.com> <robb@gorbachev.>
88+Roi Cohen <roico.beryl@gmail.com> <roico@roico-desktop.>
89+Roland Bär <roland@verifysoft.de> <roland@verifysoft.de>
90+Roland Bär <roland@verifysoft.de> <roland@verifysoft.net>
91+Roland Bär <roland@verifysoft.de> <roland@Vista.>
92+Roland Bär <roland@verifysoft.de> <roland@Vista.>
93+Sami Jaktholm <sampo_75@windowslive.com> <sampo_75@windowslive.com>
94+Sami Jaktholm <sampo_75@windowslive.com> <sjakthol@outlook.com>
95+Sam Spilsbury <smspillaz@gmail.com> Sam
96+Sam Spilsbury <smspillaz@gmail.com> <Sam@ACER-SUSE.SUSE>
97+Sam Spilsbury <smspillaz@gmail.com> Sam Spillaz
98+Sam Spilsbury <smspillaz@gmail.com> <sam.spilsbury@canonical.com>
99+Sam Spilsbury <smspillaz@gmail.com> Sam Spilsbury <mailto>
100+Sam Spilsbury <smspillaz@gmail.com> Sam Spilsbury smspillaz@gmail.com <>
101+Sam Spilsbury <smspillaz@gmail.com> <Sam@XPS-SUSE.site>
102+Sam Spilsbury <smspillaz@gmail.com> <Sam@XPS-SUSE.XPS>
103+Sam Spilsbury <smspillaz@gmail.com> <SmSpillaz@gmail.com>
104+Sam Spilsbury <smspillaz@gmail.com> <smspillaz@opencompositing.org>
105+Sam Spilsbury <smspillaz@gmail.com> <smspillaz@smspillaz-desktop.>
106+Sam Spilsbury <smspillaz@gmail.com> <smspillaz@XPS-FEDORA.>
107+Sam Spilsbury <smspillaz@gmail.com> <smspillaz@XPS-U.>
108+Sam Spilsbury <smspillaz@gmail.com> <smspillaz@XPS-UNITY.>
109+Sam Spilsbury <smspillaz@gmail.com> <unity@VB-U1010.>
110+Scott Moreau <oreaus@gmail.com> <moreaus@gmail.com>
111+Scott Moreau <oreaus@gmail.com> <scott@box1.>
112+Stephen M. Webb <stephen.webb@canonical.com> Stepehn M. Webb
113+Thomas Jaeger <thjaeger@gmail.com> <ThJaeger@gmail.com>
114+Thomas Thurman <thomas.thurman@canonical.com> thomas.thurman@canonical.com <>
115+Thomas Voß <thomas.voss@rub.de> Thomas Voß <>
116+Thomas Voß <thomas.voss@rub.de> <thomas.voss@canonical.com>
117+Timo Jyrinki <timo.jyrinki@canonical.com> timo.jyrinki@canonical.com <>
118+Tim Penhey <tim.penhey@canonical.com> Time Penhey
119+Travis Watkins <amaranth@ubuntu.com> <amaranth@opencompositing.org>
120+Travis Watkins <amaranth@ubuntu.com> <travis@ronin.>
121+Travis Watkins <amaranth@ubuntu.com> <travis.watkins@linaro.org>
122+warlock <warlock@opencompositing.org> <warlock@banana.>
123+warlock <warlock@opencompositing.org> <warlock.cc@gmail.com>

Subscribers

People subscribed via source and target branches