summaryrefslogtreecommitdiffhomepage
path: root/.mailmap
diff options
context:
space:
mode:
authorAndrew Clayton <a.clayton@nginx.com>2024-01-12 18:33:27 +0000
committerAndrew Clayton <a.clayton@nginx.com>2024-01-12 18:33:27 +0000
commite95a91cbfac018b9877d9e389e614e9f2a9f1313 (patch)
tree51f655678cc3a8c8c1fb0225c28a2cb2e2a98d82 /.mailmap
parentb04455f6c15ef91b8e6a5dd236fcec1e73e744c9 (diff)
downloadunit-e95a91cbfac018b9877d9e389e614e9f2a9f1313.tar.gz
unit-e95a91cbfac018b9877d9e389e614e9f2a9f1313.tar.bz2
.mailmap: Add a few more entries
Fix up a mixture of different names/email addresses people have used. You can always see the original names/addresses used by passing --no-mailmap to the various git commands. See gitmailmap(5) Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap9
1 files changed, 9 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 5ec812a7..21085d68 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,7 +1,16 @@
Alejandro Colomar <alx@kernel.org> <alx@nginx.com>
Alejandro Colomar <alx@kernel.org> <a.colomar@f5.com>
Alejandro Colomar <alx@kernel.org> <alx.manpages@gmail.com>
+Andrei Zeliankou <zelenkov@nginx.com>
Andrew Clayton <a.clayton@nginx.com> <andrew@digital-domain.net>
Andrew Clayton <a.clayton@nginx.com> <a.clayton@f5.com>
+Artem Konev <artem.konev@nginx.com> <41629299+artemkonev@users.noreply.github.com>
Danielle De Leo <d.deleo@f5.com> <danielle@fastmail.net>
+Konstantin Pavlov <thresh@nginx.com> <thresh@videolan.org>
+Max Romanov <max.romanov@gmail.com> <max.romanov@nginx.com>
+OutOfFocus4 <jeff.iadarola@gmail.com> <jeffrey_iadarola@urmc.rochester.edu>
+Sergey A. Osokin <sergey.osokin@nginx.com> <osa@FreeBSD.org.ru>
Taryn Musgrave <t.musgrave@f5.com> <34845739+tarynmusgrave@users.noreply.github.com>
+Tiago Natel de Moura <t.nateldemoura@f5.com>
+Timo Stark <t.stark@nginx.com> <tippexs91@googlemail.com>
+Zhidao HONG <z.hong@f5.com> <hongzhidao@gmail.com>