From b9af64e5069f572f4cff3e74de407c7828005b5b Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Thu, 8 Jun 2017 14:48:22 +0200
Subject: [PATCH] Update .mailmap to make auto-generating work

When mapping e-mail addresses and names;

    <preferred@example.com> <foo@bar.com>

Maps `foo@bar.com` to `preferred@example.com`, whereas:

     Preferred Name <preferred@example.com> <foo@bar.com>

Will update the e-mail address _and_ set the preferred name, _if_ the original
e-mail address in the commit was `<foo@bar.com>` (otherwise the rule is not
executed).

Finally, this rule:

 Preferred Name <preferred@example.com>

Will set the name to `Preferred Name` if the e-mail address in the commit
matches `preferred@example.com`

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 .mailmap | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.mailmap b/.mailmap
index fca29fe2f..4f634365a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -10,9 +10,11 @@ Amir Chaudhry <amir.chaudhry@docker.com> <amirmc@gmail.com>
 Anil Madhavapeddy <anil.madhavapeddy@docker.com> <anil@recoil.org>
 Dan Finneran <dan@thebsdbox.co.uk> <dan@dev.fnnrn.me>
 Dan Finneran <dan@thebsdbox.co.uk> <daniel.finneran@gmail.com>
-Dave Scott <dave.scott@docker.com> <dave.scott@unikernel.com>
-Dave Scott <dave.scott@docker.com> <dave@recoil.org>
-Dave Scott <dave.scott@docker.com> <djs55@users.noreply.github.com>
+Dan Finneran <dan@thebsdbox.co.uk>
+David Scott <dave.scott@docker.com> <dave.scott@unikernel.com>
+David Scott <dave.scott@docker.com> <dave@recoil.org>
+David Scott <dave.scott@docker.com> <djs55@users.noreply.github.com>
+David Scott <dave.scott@docker.com>
 Dave Tucker <dt@docker.com> <dave@dtucker.co.uk>
 David Gageot <david.gageot@docker.com> <david@gageot.net>
 David Sheets <david.sheets@docker.com> <dsheets@docker.com>
@@ -26,6 +28,7 @@ Magnus Skjegstad <magnus.skjegstad@docker.com> <magnus@skjegstad.com>
 Mindy Preston <mindy.preston@docker.com> <meetup@yomimono.org>
 Nathan LeClaire <nathan.leclaire@docker.com> <nathan.leclaire@gmail.com>
 Nathan LeClaire <nathan.leclaire@docker.com> <nathanleclaire@gmail.com>
+Radu Matei <matei.radu94@gmail.com>
 Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com> <riyazdf@berkeley.edu>
 Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com> <riyazdf@gmail.com>
 Rolf Neugebauer <rolf.neugebauer@docker.com> <rneugeba@users.noreply.github.com>