As can be seen with "git --no-pager shortlog -nse", we have several
duplicates.  The attached patch should fix those.  I'm Cc-ing this
message to people whose names/emails are touched, so you can check
whether the proper ones are used.

>From 270faa924e54297df8a04301bcedabb6c6de1b2f Mon Sep 17 00:00:00 2001
From: Alex Kost <alez...@gmail.com>
Date: Thu, 17 Mar 2016 13:49:28 +0300
Subject: [PATCH] Update .mailmap.

* .mailmap: Add new entries for Al McElrath, Andreas Enge, Ben
  Woodcroft, David Thompson, Leo Famulari, Mathieu Lirzin, Nils
  Gillmann, Raimon Grau.
---
 .mailmap | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index a5fa857..563320b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,14 +1,19 @@
 # This list is used to avoid multiple name/email instances of the same
 # contributors reported by "git log" and "git shortlog" commands.
 
+Al McElrath <he...@yrns.org> <he...@atonesir.com>
 Alexander I. Grafov <gra...@gmail.com>
 Amirouche Boubekki <amirou...@hypermove.net>
+Andreas Enge <andr...@enge.fr> <andreas.e...@inria.fr>
+Andreas Enge <andr...@enge.fr> <privat@xobs-novena>
 Andy Wingo <wi...@igalia.com> <wi...@pobox.com>
-Ben Woodcroft <b.woodcr...@uq.edu.au> <donttrust...@gmail.com>
+Ben Woodcroft <donttrust...@gmail.com> <b.woodcr...@uq.edu.au>
+Ben Woodcroft <donttrust...@gmail.com> <donttrustben near gmail.com>
 Claes Wallin (韋嘉誠) <claes.wal...@greatsinodevelopment.com>
 Cyprien Nicolas <cypr...@nicolas.tf> <c.nicolas+gitori...@gmail.com>
 David Thompson <da...@gnu.org> <dthomps...@worcester.edu>
 David Thompson <da...@gnu.org> <dthomp...@member.fsf.org>
+David Thompson <da...@gnu.org> <dthomp...@vistahigherlearning.com>
 Deck Pickard <deck.r.pick...@gmail.com> <nebu@kipple>
 Eric Bavier <bav...@member.fsf.org> <ericbav...@gmail.com>
 Eric Dvorsak <e...@dvorsak.fr> <yen...@gmail.com>
@@ -17,11 +22,15 @@ Joshua Grant <ta...@riseup.net> <g...@riseup.net>
 Joshua Grant <ta...@riseup.net> <jgr...@parenthetical.io>
 Joshua Grant <ta...@riseup.net> <tadn...@gmail.com>
 Joshua Grant <ta...@riseup.net> <youlys...@riseup.net>
+Leo Famulari <l...@famulari.name> <lfamu...@gmail.com>
 Ludovic Courtès <l...@gnu.org> <ludovic.cour...@inria.fr>
-Mathieu Lirzin <m...@openmailbox.org> <mathieu.lir...@openmailbox.org>
+Mathieu Lirzin <m...@gnu.org> <m...@openmailbox.org>
+Mathieu Lirzin <m...@gnu.org> <mathieu.lir...@openmailbox.org>
 Nikita Karetnikov <nik...@karetnikov.org> <nikita.karetni...@gmail.com>
+Nils Gillmann <niaster...@grrlz.net> <ng@niasterisk.space>
 Pjotr Prins <pjotr.publi...@thebird.nl>
 Pjotr Prins <pjotr.publi...@thebird.nl> <pjotr.publi...@thebird.nl>
+Raimon Grau <raimons...@gmail.com> <rai...@3scale.net>
 Ricardo Wurmus <rek...@elephly.net>
 Ricardo Wurmus <rek...@elephly.net> <ricardo.wur...@mdc-berlin.de>
 Sou Bunnbu (宋文武) <iyzs...@gmail.com>
-- 
2.6.3

-- 
Alex is watching you!

Reply via email to