From: ng0 <ng0@n0.is>
Date: Thu, 4 Jan 2018 23:19:58 +0000 (+0000)
Subject: introduce .mailmap
X-Git-Tag: gnunet-0.11.0rc0~17
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=808aaae0cc2ed4f41ab21563c33759f563bcd5cc;p=oweals%2Fgnunet.git

introduce .mailmap

Some of us use(d) various names or emails interchangeable over the years/currently.
git integrated tools can help to count how many people contributed to a release,
the use of mailmap (https://www.kernel.org/pub/software/scm/git/docs/git-shortlog.html)
helps to map authors+email.

If I used the wrong prefered primary name+email, change it yourself.
Only it yourself in this file if you used more than one name/email.
---

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..4db81bf05
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,26 @@
+Bart Polot <bart.polot+gnunet@gmail.com>
+Bart Polot <bart.polot+gnunet@gmail.com> <bart.polot+voyager@gmail.com>
+Bart Polot <bart.polot+gnunet@gmail.com> <bart@net.in.tum.de>
+Carlo von lynX <lynX@time.to.get.psyced.org>
+Carlo von lynX <lynX@time.to.get.psyced.org> psyc://loupsycedyglgamf.onion/~lynX <BM-NB7xa9gEpmJgYp9PVnEdACiZcGmmEJcY>
+Carlo von lynX <lynX@time.to.get.psyced.org> psyc://loupsycedyglgamf.onion/~lynX <ircs://psyced.org/youbroketheinternet>
+David Barksdale <amatus@amat.us> <amatus.amongus@gmail.com>
+David Barksdale <amatus@amat.us>
+David Barksdale <amatus@amat.us> <amatus@amatus.name>
+Jeffrey Burdges <burdges@gnunet.org> Jeff Burdges <burdges@gnunet.org>
+Jeffrey Burdges <burdges@gnunet.org>
+Руслан Ижбулатов <lrn1986@gmail.com>
+Руслан Ижбулатов <lrn1986@gmail.com> LRN <lrn1986@gmail.com>
+Martin Schanzenbach <martin.schanzenbach@aisec.fraunhofer.de> Schanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de>
+Martin Schanzenbach <martin.schanzenbach@aisec.fraunhofer.de> Schanzenbach, Martin <mschanzenbach@posteo.de>
+Martin Schanzenbach <martin.schanzenbach@aisec.fraunhofer.de> Martin Schanzenbach <mschanzenbach@posteo.de>
+ng0 <ng0@n0.is>
+ng0 <ng0@n0.is> <contact.ng0@cryptolab.net>
+ng0 <ng0@n0.is> <ng0@infotropique.org>
+ng0 <ng0@n0.is> N. 'ng0' Gillmann <ngillmann@runbox.com>
+ng0 <ng0@n0.is> <ng0@we.make.ritual.n0.is>
+t3sserakt <t3ss@posteo.de>
+t3sserakt <t3ss@posteo.de> <t3sserakt@posteo.de>
+tg(x) <*@tg-x.net>
+tg(x) <*@tg-x.net> Gabor X Toth <*@tg-x.net>
+