From 8af364e7702d6949a92399d5e6965a83e06b9866 Mon Sep 17 00:00:00 2001 From: Arnaud Spiwack Date: Fri, 17 Jan 2014 12:04:08 +0100 Subject: Update .mailmap with recent contributors. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I should have updated everyone who committed since the migration to git (giving me a canonical email). I've search git shortlog -s to ensure the best I could that there are no duplicate. I discovered that email addresses from the mailmap are uncapitalised whereas the unmodified addresses are not, creating two different authors for no reason. So, I've added some record to normalise the canonical email addresses when needed. --- .mailmap | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) (limited to '.mailmap') diff --git a/.mailmap b/.mailmap index ea7f0378b..ef5453598 100644 --- a/.mailmap +++ b/.mailmap @@ -9,29 +9,37 @@ ## If you're mentionned here and want to update your information, ## either amend this file and commit it, or contact the coqdev list -Bruno Barras barras -Bruno Barras barras-local +Bruno Barras barras +Bruno Barras barras-local Yves Bertot bertot -Frédéric Besson fbesson -Pierre Boutillier pboutill -Xavier Clerc xclerc +Frédéric Besson fbesson +Pierre Boutillier pboutill +Pierre Boutillier Pierre +Xavier Clerc xclerc +Xavier Clerc xclerc Pierre Corbineau corbinea Judicaël Courant courant -Pierre Courtieu courtieu +Pierre Courtieu courtieu +# uncapitalises the email address: +Pierre Courtieu Pierre Courtieu David Delahaye delahaye -Maxime Dénès mdenes +Maxime Dénès mdenes Daniel De Rauglaudre ddr Olivier Desmettre desmettr Damien Doligez doligez Jean-Christophe Filliâtre filliatr Julien Forest jforest Julien Forest forest -Stéphane Glondu glondu +Stéphane Glondu glondu +# corrects accent: +Stéphane Glondu Stephane Glondu Benjamin Grégoire bgregoir Benjamin Grégoire gregoire Vincent Gross vgross Huang Guan-Shieng huang -Hugo Herbelin herbelin +Hugo Herbelin herbelin +# uncapitalises the email address: +Hugo Herbelin Hugo Herbelin Tom Hutchinson thutchin Cezary Kaliszyk cek Florent Kirchner fkirchne @@ -42,7 +50,7 @@ Evgeny Makarov emakarov lmamane Claude Marché marche Micaela Mayero mayero -Guillaume Melquiond gmelquio +Guillaume Melquiond gmelquio Alexandre Miquel miquel Benjamin Monate monate Julien Narboux jnarboux @@ -60,8 +68,8 @@ Clément Renard clrenard sacerdot Vincent Siles vsiles Elie Soubiran soubiran -Matthieu Sozeau msozeau -Arnaud Spiwack aspiwack +Matthieu Sozeau msozeau +Arnaud Spiwack aspiwack Enrico Tassi gareuselesinge Laurent Théry thery Benjamin Werner werner -- cgit v1.2.3