summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2026-01-23 13:34:35 -0800
committerJunio C Hamano <gitster@pobox.com>2026-01-23 13:34:35 -0800
commitb3722b381e7052225a87c5061ed5bb5952920d83 (patch)
tree88abf348ac2246dc3660f352cb33ea6b28ad3c7b
parent1faf5b085a171f9ba9a6d7a446e0de16acccb1dc (diff)
parent7dfd1b4c138596c5b5369dca2102b80fe42e95c0 (diff)
downloadgit-b3722b381e7052225a87c5061ed5bb5952920d83.tar.xz
Merge branch 'kh/mailmap-avila'
* kh/mailmap-avila: .mailmap: fix and expand mappings for Jean-Noël Avila
-rw-r--r--.mailmap3
1 files changed, 3 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 3cf26b1add..799734821b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -107,6 +107,9 @@ Jason Riedy <ejr@eecs.berkeley.edu> <ejr@cs.berkeley.edu>
Jay Soffian <jaysoffian@gmail.com> <jaysoffian+git@gmail.com>
Jean-Noël Avila <jn.avila@free.fr> Jean-Noel Avila
Jean-Noël Avila <jn.avila@free.fr> Jean-Noël AVILA
+Jean-Noël Avila <jn.avila@free.fr> Jean-Noel Avila <jean-noel.avila@scantech.fr>
+Jean-Noël Avila <jn.avila@free.fr> Jean-Noël AVILA <avila.jn@gmail.com>
+Jean-Noël Avila <jn.avila@free.fr> Jean-Noël Avila via GitGitGadget <gitgitgadget@gmail.com>
Jeff King <peff@peff.net> <peff@github.com>
Jeff Muizelaar <jmuizelaar@mozilla.com> <jeff@infidigm.net>
Jens Axboe <axboe@kernel.dk> <axboe@suse.de>