summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Miika Turkia <miika.turkia@gmail.com>2018-05-25 07:27:48 +0300
committerGravatar Robert C. Helling <helling@atdotde.de>2018-05-25 15:52:09 +0200
commitc1a9eafa216ea4e538a0cfa45b7a29dd3552f7fb (patch)
tree573a4e835f1b22681eff581f69fa4dde5acb3979
parenta76f15f0f67c3f138362ec8c503f645dc1211cf5 (diff)
downloadsubsurface-c1a9eafa216ea4e538a0cfa45b7a29dd3552f7fb.tar.gz
Add .mailmap to combine individual contributors
This will combine contributions to one identity even when using multiple email addresses (or differences in real name). I.e. Tomaz had two different identities in top 20 contributors list. Now "git shortlog -sne" will show them all under one contributor. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> --- Not that this would really matter, but since we do run git shortlog -sne to get stats we might as well get more correct results :D I am sure there are still some mistakes as I used exact realname matching in a longish shell one-liner, complemented with some manual tuning for Willem and Robert as I spotted them to have some variations on real name...
-rw-r--r--.mailmap28
1 files changed, 28 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..13599303b
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,28 @@
+<olteanu.claudiu@ymail.com> <olteanu.vasilica.claudiu@gmail.com>
+<danilo.eu@gmail.com> <danilo.cesar@collabora.co.uk>
+<dirk@hohndel.org> <dhohndel@dhohndel-mac02.jf.intel.com>
+<dirk@hohndel.org> <hohndel@mail.gr8dns.org>
+<guido.lerch@gmail.com> <glerch@Guidos-MacBook-Air.local>
+<jacco.van.koll@gmail.com> <jko@haringstad.com>
+<jlmulder@xs4all.nl> <jlmulder@planet.nl>
+<jef@libdivecomputer.org> <jefdriesen@telenet.be>
+<j.bygdell@gmail.com> <narogh@Qutie.local>
+<karent.bug@gmail.com> <k.arentowicz@gmail.com>
+<me@bearsh.org> <m.gysel@consonics.ch>
+<miika.turkia@gmail.com> <miika.turkia@nixu.fi>
+Robert C. Helling <helling@atdotde.de>
+Robert C. Helling <helling@atdotde.de> Robert.Helling <helling@atdotde.de>
+Robert C. Helling <helling@atdotde.de> Robert.Helling <Helling@th-nb-tmpmbp05.fritz.box>
+Robert C. Helling <helling@atdotde.de> Robert C. Helling <robert@thetheoreticaldiver.org>
+Robert C. Helling <helling@atdotde.de> Robert C. Helling <helling@lmu.de>
+Robert C. Helling <helling@atdotde.de> Robert Helling <helling@lmu.de>
+<sander@myowndomain.nl> <sander.kleywegt@netscout.com>
+<tim@tee-jay.demon.co.uk> <tim@tee-jay.org.uk>
+<tim@tee-jay.demon.co.uk> <timw00.tw@googlemail.com>
+<tomaz.canabrava@intel.com> <tcanabrava@kde.org>
+<tomaz.canabrava@intel.com> <tomaz.canabrava@gmail.com>
+<tomaz.canabrava@intel.com> <tomazcanabrava@Tomazs-MacBook-Pro.local>
+Willem Ferguson <willemferguson@zoology.up.ac.za>
+<willemferguson@zoology.up.ac.za> <fergusonwillem@gmail.com>
+<willemferguson@zoology.up.ac.za> <willem@localhost.localdomain>
+<willemferguson@zoology.up.ac.za> <willem@willem-Precision-M4700.(none)>