Over the years of contributing to open source, I realized the world of open source is smaller than I originally thought and a name is still a pretty unique thing. So let's assume these two author idents are the same person. In 10813e0d3c7 (.mailmap: update long-lost friends with multiple defunct addresses, 2013-08-12) we learned both their email bounce, so asking is no option. Signed-off-by: Stefan Beller <sbeller@xxxxxxxxxx> --- .mailmap | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.mailmap b/.mailmap index f165222a782..ff96ef7401f 100644 --- a/.mailmap +++ b/.mailmap @@ -82,10 +82,7 @@ J. Bruce Fields <bfields@xxxxxxxxxxxxxx> <bfields@xxxxxxxxxxxxxxxxxxxxxxxx> J. Bruce Fields <bfields@xxxxxxxxxxxxxx> <bfields@xxxxxxxxxxxxxxxxxxx> Jakub Narębski <jnareb@xxxxxxxxx> James Y Knight <jknight@xxxxxxxxxxxxxxx> <foom@xxxxxxxx> -# The 2 following authors are probably the same person, -# but both emails bounce. -Jason McMullan <jason.mcmullan@xxxxxxxxxxx> -Jason McMullan <mcmullan@xxxxxxxxxx> +Jason McMullan <jason.mcmullan@xxxxxxxxxxx> Jason McMullan <mcmullan@xxxxxxxxxx> Jason Riedy <ejr@xxxxxxxxxxxxxxxxx> <ejr@xxxxxxxxxxxxxxxxx> Jason Riedy <ejr@xxxxxxxxxxxxxxxxx> <ejr@xxxxxxxxxxxxxxx> Jay Soffian <jaysoffian@xxxxxxxxx> <jaysoffian+git@xxxxxxxxx> -- 2.18.0.399.gad0ab374a1-goog
