summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrew Clayton <a.clayton@nginx.com>2023-12-06 13:52:44 +0000
committerAndrew Clayton <a.clayton@nginx.com>2023-12-06 14:08:35 +0000
commit846a7f483643a00322f81a7848ca556722e5469a (patch)
tree516a8a407f5c986fa18e2771a316cd3e91647c2b
parentf26bd644fe50d6817bddd12235ba3d269421e9b4 (diff)
downloadunit-846a7f483643a00322f81a7848ca556722e5469a.tar.gz
unit-846a7f483643a00322f81a7848ca556722e5469a.tar.bz2
.mailmap: Set correct address for Danielle
Due to GH making a mess of merge commits, it used Danielle's personal email address for the merge, it also used a generic GH address for the committer but we can't do anything about that. However we can fix the 'Author' email address. If for some reason you want to see the original names/addresses used you can generally pass --no-mailmap to git commands. Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index cdacea39..f622acf3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -3,3 +3,4 @@ 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>
+Danielle De Leo <d.deleo@f5.com> <danielle@fastmail.net>