summaryrefslogtreecommitdiffhomepage
path: root/.mailmap
diff options
context:
space:
mode:
authorAlejandro Colomar <alx@kernel.org>2023-10-25 14:00:38 +0200
committerAndrew Clayton <a.clayton@nginx.com>2023-10-25 15:20:07 +0100
commit299e783e5dfbd81678dd21545e1c48582a399fec (patch)
tree819f69ba7d4aecc8f94922aea1977946afbb59d6 /.mailmap
parentfb33ec86a3b6ca6a844dfa6980bb9e083094abec (diff)
downloadunit-299e783e5dfbd81678dd21545e1c48582a399fec.tar.gz
unit-299e783e5dfbd81678dd21545e1c48582a399fec.tar.bz2
.mailmap: updated address for Alex.
Signed-off-by: Alejandro Colomar <alx@kernel.org> Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap5
1 files changed, 3 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index d6405683..cdacea39 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,5 @@
-Alejandro Colomar <alx@nginx.com> <a.colomar@f5.com>
-Alejandro Colomar <alx@nginx.com> <alx.manpages@gmail.com>
+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>
Andrew Clayton <a.clayton@nginx.com> <andrew@digital-domain.net>
Andrew Clayton <a.clayton@nginx.com> <a.clayton@f5.com>