From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alex Kost <alezost@gmail.com>
Subject: [PATCH] Update .mailmap.
Date: Thu, 17 Mar 2016 14:09:27 +0300
Message-ID: <87zitxcqe0.fsf@gmail.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:41552)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <alezost@gmail.com>) id 1agVnp-0002OQ-1H
	for guix-devel@gnu.org; Thu, 17 Mar 2016 07:09:20 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <alezost@gmail.com>) id 1agVnk-0005qj-BZ
	for guix-devel@gnu.org; Thu, 17 Mar 2016 07:09:16 -0400
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
To: guix-devel@gnu.org
Cc: Raimon Grau <raimonster@gmail.com>, Nils Gillmann <niasterisk@grrlz.net>, Ben Woodcroft <donttrustben@gmail.com>, Al McElrath <hello@yrns.org>, David Thompson <davet@gnu.org>

--=-=-=
Content-Type: text/plain

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.


--=-=-=
Content-Type: text/x-patch; charset=utf-8
Content-Disposition: attachment; filename=0001-Update-.mailmap.patch
Content-Transfer-Encoding: quoted-printable

>From 270faa924e54297df8a04301bcedabb6c6de1b2f Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@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.
=20
+Al McElrath <hello@yrns.org> <hello@atonesir.com>
 Alexander I. Grafov <grafov@gmail.com>
 Amirouche Boubekki <amirouche@hypermove.net>
+Andreas Enge <andreas@enge.fr> <andreas.enge@inria.fr>
+Andreas Enge <andreas@enge.fr> <privat@xobs-novena>
 Andy Wingo <wingo@igalia.com> <wingo@pobox.com>
-Ben Woodcroft <b.woodcroft@uq.edu.au> <donttrustben@gmail.com>
+Ben Woodcroft <donttrustben@gmail.com> <b.woodcroft@uq.edu.au>
+Ben Woodcroft <donttrustben@gmail.com> <donttrustben near gmail.com>
 Claes Wallin (=E9=9F=8B=E5=98=89=E8=AA=A0) <claes.wallin@greatsinodevelopm=
ent.com>
 Cyprien Nicolas <cyprien@nicolas.tf> <c.nicolas+gitorious@gmail.com>
 David Thompson <davet@gnu.org> <dthompson2@worcester.edu>
 David Thompson <davet@gnu.org> <dthompson@member.fsf.org>
+David Thompson <davet@gnu.org> <dthompson@vistahigherlearning.com>
 Deck Pickard <deck.r.pickard@gmail.com> <nebu@kipple>
 Eric Bavier <bavier@member.fsf.org> <ericbavier@gmail.com>
 Eric Dvorsak <eric@dvorsak.fr> <yenda1@gmail.com>
@@ -17,11 +22,15 @@ Joshua Grant <tadni@riseup.net> <gzg@riseup.net>
 Joshua Grant <tadni@riseup.net> <jgrant@parenthetical.io>
 Joshua Grant <tadni@riseup.net> <tadnimi@gmail.com>
 Joshua Grant <tadni@riseup.net> <youlysses@riseup.net>
+Leo Famulari <leo@famulari.name> <lfamular@gmail.com>
 Ludovic Court=C3=A8s <ludo@gnu.org> <ludovic.courtes@inria.fr>
-Mathieu Lirzin <mthl@openmailbox.org> <mathieu.lirzin@openmailbox.org>
+Mathieu Lirzin <mthl@gnu.org> <mthl@openmailbox.org>
+Mathieu Lirzin <mthl@gnu.org> <mathieu.lirzin@openmailbox.org>
 Nikita Karetnikov <nikita@karetnikov.org> <nikita.karetnikov@gmail.com>
+Nils Gillmann <niasterisk@grrlz.net> <ng@niasterisk.space>
 Pjotr Prins <pjotr.public01@thebird.nl>
 Pjotr Prins <pjotr.public01@thebird.nl> <pjotr.public12@thebird.nl>
+Raimon Grau <raimonster@gmail.com> <raimon@3scale.net>
 Ricardo Wurmus <rekado@elephly.net>
 Ricardo Wurmus <rekado@elephly.net> <ricardo.wurmus@mdc-berlin.de>
 Sou Bunnbu (=E5=AE=8B=E6=96=87=E6=AD=A6) <iyzsong@gmail.com>
--=20
2.6.3


--=-=-=
Content-Type: text/plain


-- 
Alex is watching you!

--=-=-=--