From 015608dff26cd6082467537f3a4d1de575af7d50 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Wed, 18 Jan 2012 14:44:48 +0100 Subject: [PATCH] 7439 Mailmap for master Content-Type: text/plain; charset="utf-8" Adding mailmap for git shortlog to master. Already present in 3.6.X. --- .mailmap | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) create mode 100644 .mailmap diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000..068b4f6 --- /dev/null +++ b/.mailmap @@ -0,0 +1,51 @@ +# This file maintains name/email mappings for git-shortlog use +# For more information on the use of this file see '$ git shortlog -h' +# Name to mail mapping: the name in the right column will be mapped to the email addy in the left + +James Mason +Henri-Damien Laurent +Alex Arnaud +Chris Cormack +Chris Nighswonger +Colin Campbell +D Ruth Bavousett +Frédéric Demians +Frédérick Capovilla +Galen Charlton +Greg Barniskis +Ian Walls +Janusz Kaczmarek +Jared Camins-Esakov +Jonathan Druart +Joy Nelson +Juan Sieira +Katrin Fischer +Larry Baerveldt +Liz Rea +MJ Ray +Magnus Enger +Marcel de Rooy +Marcel de Rooy +Mason James +Matthias Meusburger +Maxime Pelletier +Meenakshi R +Nicole Engard +Owen Leonard +Paul Poulain +Robin Sheat +Srdjan Jankovic + +# Name to name mapping: the name in the right column will be mapped to the name in the left + +Chris Nighswonger Chris R. Nighswonger +Jared Camins-Esakov Jared CAMINS-ESAKOV + +# Mail to mail mapping: the email addy in the right column will be mapped to the email addy in the left + + + + + + + -- 1.6.0.6