summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2016-08-08 13:10:52 +0200
committerHarald Welte <laforge@gnumonks.org>2016-08-08 13:12:17 +0200
commit1a70223fa3fce4ad21fcb987f422bcc040450cee (patch)
tree586af5e7be6c9f30f8e0eee52c44c17f00a6427d
parent9a9739c6ab56f0ad202bf24e82a0702072c608f6 (diff)
Add .mailmap file for mapping mail addresses in shortlog
Change-Id: Id6b42bb9ab10f46b76b26057c8228e5da480286d
-rw-r--r--.mailmap12
1 files changed, 12 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..cda40579
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,12 @@
+Harald Welte <laforge@gnumonks.org>
+Harald Welte <laforge@gnumonks.org> <laflocal@hanuman.gnumonks.org>
+Harald Welte <laforge@gnumonks.org> <laflocal@goeller.de.gnumonks.org>
+Holger Hans Peter Freyther <holger@moiji-mobile.com> <zecke@selfish.org>
+Holger Hans Peter Freyther <holger@moiji-mobile.com> <ich@tamarin.(none)>
+Holger Hans Peter Freyther <holgre@moiji-mobile.com> <holger@freyther.de>
+Andreas Eversberg <jolly@eversberg.eu>
+Andreas Eversberg <jolly@eversberg.eu> <Andreas.Eversberg@versatel.de>
+Andreas Eversberg <jolly@eversberg.eu> <root@nuedel.(none)>
+Pablo Neira Ayuso <pablo@soleta.eu> <pablo@gnumonks.org>
+Max Suraev <msuraev@sysmocom.de>
+Tom Tsou <tom.tsou@ettus.com> <tom@tsou.cc>