A .mailmap file for a nice git-shorlog display

 In particular, this file allows to merge duplicated identities
 of a same person. See man git shortlog for more details.

1 files changed, 72 insertions, 0 deletions

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..bf2e50530
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,72 @@
+## Coq contributors
+##
+## This file allows to join the different accounts of a same person.
+## Cf for instance: git shortlog -nse. More details via: man git shortlog
+##
+## To avoid spam issues, we use by default a pseudo-email <login@gforge>
+## for all persons that haven't made commits with real emails
+##
+## 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@gforge>                       barras <barras@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Bruno Barras <barras@gforge>                       barras-local <barras-local@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Yves Bertot <bertot@gforge>                        bertot <bertot@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Frédéric Besson <fbesson@gforge>                   fbesson <fbesson@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Pierre Boutillier <pboutill@gforge>                pboutill <pboutill@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Xavier Clerc <xclerc@gforge>                       xclerc <xclerc@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Pierre Corbineau <corbinea@gforge>                 corbinea <corbinea@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Judicaël Courant <courant@gforge>                  courant <courant@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Pierre Courtieu <courtieu@gforge>                  courtieu <courtieu@85f007b7-540e-0410-9357-904b9bb8a0f7>
+David Delahaye <delahaye@gforge>                   delahaye <delahaye@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Maxime Dénès <mdenes@gforge>                       mdenes <mdenes@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Daniel De Rauglaudre <ddr@gforge>                  ddr <ddr@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Olivier Desmettre <desmettr@gforge>                desmettr <desmettr@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Damien Doligez <doligez@gforge>                    doligez <doligez@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Jean-Christophe Filliâtre <filliatr@gforge>        filliatr <filliatr@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Julien Forest <jforest@gforge>                     jforest <jforest@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Stéphane Glondu <glondu@gforge>                    glondu <glondu@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Benjamin Grégoire <bgregoire@gforge>               bgregoir <bgregoir@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Benjamin Grégoire <bgregoire@gforge>               gregoire <gregoire@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Vincent Gross <vgross@gforge>                      vgross <vgross@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Huang Guan-Shieng <huang@gforge>                   huang <huang@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Hugo Herbelin <herbelin@gforge>                    herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Tom Hutchinson <thutchin@gforge>                   thutchin <thutchin@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Cezary Kaliszyk <cek@gforge>                       cek <cek@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Florent Kirchner <fkirchne@gforge>                 fkirchne <fkirchne@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Florent Kirchner <fkirchne@gforge>                 kirchner <kirchner@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Pierre Letouzey <letouzey@gforge>                  letouzey <letouzey@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Assia Mahboubi <amahboub@gforge>                   amahboub <amahboub@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Evgeny Makarov <emakarov@gforge>                   emakarov <emakarov@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Lionel Elie Mamane <lmamane@gforge>                lmamane <lmamane@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Claude Marché <marche@gforge>                      marche <marche@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Micaela Mayero <mayero@gforge>                     mayero <mayero@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Guillaume Melquiond <gmelquio@gforge>              gmelquio <gmelquio@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Alexandre Miquel <miquel@gforge>                   miquel <miquel@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Benjamin Monate <monate@gforge>                    monate <monate@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Julien Narboux <jnarboux@gforge>                   jnarboux <jnarboux@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Julien Narboux <jnarboux@gforge>                   narboux <narboux@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Jean-Marc Notin <notin@gforge>                     notin,no-port-forwarding,no-agent-forwarding,no-X11-forwarding,no-pty <notin,no-port-forwarding,no-agent-forwarding,no-X11-forwarding,no-pty@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Jean-Marc Notin <notin@gforge>                     notin <notin@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Russel O'Connor <roconnor@gforge>                  roconnor <roconnor@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Christine Paulin <cpaulin@gforge>                  cpaulin <cpaulin@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Christine Paulin <cpaulin@gforge>                  mohring <mohring@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Pierre-Marie Pédrot <ppedrot@gforge>               ppedrot <ppedrot@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Loïc Pottier <pottier@gforge>                      pottier <pottier@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Matthias Puech <puech@gforge>                      puech <puech@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Yann Régis-Gianas <regisgia@gforge>                regisgia <regisgia@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Clément Renard <clrenard@gforge>                   clrenard <clrenard@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Claudio Sacerdoti Coen <sacerdot@gforge>           sacerdot <sacerdot@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Vincent Siles <vsiles@gforge>                      vsiles <vsiles@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Elie Soubiran <soubiran@gforge>                    soubiran <soubiran@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Matthieu Sozeau <msozeau@gforge>                   msozeau <msozeau@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Arnaud Spiwack <aspiwack@gforge>                   aspiwack <aspiwack@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Enrico Tassi <gareuselesinge@gforge>               gareuselesinge <gareuselesinge@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Laurent Théry <thery@gforge>                       thery <thery@85f007b7-540e-0410-9357-904b9bb8a0f7>
+Benjamin Werner <werner@gforge>                    werner <werner@85f007b7-540e-0410-9357-904b9bb8a0f7>
+
+# Anonymous accounts
+
+anonymous < >                                      coq <coq@85f007b7-540e-0410-9357-904b9bb8a0f7>
+anonymous < >                                      (no author) <(no author)@85f007b7-540e-0410-9357-904b9bb8a0f7>
+anonymous < >                                      serpyc <serpyc@85f007b7-540e-0410-9357-904b9bb8a0f7>