Bug 26265: (QA follow-up) Remove g option from regex, add few dirs

[koha-equinox.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index 088a6a8..9a3a2da 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -1,6 +1,6 @@
 # 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
+# For more information on the use of this file see: man git-shortlog
+# Mail to name mapping: email at the right is mapped to name at the left
 
 James Mason                     <mason@kohaaloha.com>
 Henri-Damien Laurent            <henridamien.laurent@biblibre.com>
@@ -25,7 +25,7 @@ Ian Walls                       <ian.walls@bywatersolutions.com>
 Holger Meißner                  <h.meissner.82@web.de>
 Janusz Kaczmarek                <januszop@gmail.com>
 Jared Camins-Esakov             <jcamins@cpbibliography.com>
-Jonathan Druart                 <jonathan.druart@biblibre.com>
+Jonathan Druart                 <jonathan.druart@bugs.koha-community.org>
 Joy Nelson                      <joy@bywatersolutions.com>
 Juan Sieira                     <juan.sieira@xercode.es>
 Katrin Fischer                  <katrin.fischer@bsz-bw.de>
@@ -50,10 +50,16 @@ Petter Goksøyr Åsen             <petter.goksoyr.asen@kul.oslo.kommune.no>
 Robin Sheat                     <robin@catalyst.net.nz>
 Srdjan Jankovic                 <srdjan@catalyst.net.nz>
 Tomás Cohen Arazi               <tomascohen@gmail.com>
-Tomás Cohen Arazi               <tcohen@psi.unc.edu.ar>
+Tomás Cohen Arazi               <tomascohen@theke.io>
+Tomás Cohen Arazi               <tomascohen@unc.edu.ar>
 Bernardo González Kriegel       <bgkriegel@gmail.com>
 Bernardo González Kriegel       <gonzalez@di.unc.edu.ar>
 Simith D'Oliveira               <simith@inlibro.com>
+Zeno Tajoli                     <z.tajoli@cineca.it>
+Zeno Tajoli                     <tajoli@cilea.it>
+Zeno Tajoli                     <ztajoli@gmail.com>
+Silvia Simonetti                <s.simonetti@cineca.it>
+Paola Rossi                     <paola.rossi@cineca.it>
 
 # Name to name mapping: the name in the right column will be mapped to the name in the left
 
@@ -72,7 +78,11 @@ Fridolin Somers                 Fridolyn SOMERS
 <jcamins@cpbibliography.com>       <camins@numismatics.org>
 <jcamins@cpbibliography.com>       <koha@cpbibliography.com>
 <katrin.fischer@bsz-bw.de>         <Katrin.Fischer.83@web.de>
-<tcohen@psi.unc.edu.ar>            <tomascohen@gmail.com>
+<tomascohen@theke.io>              <tomascohen@gmail.com>
 <magnus.enger@kul.oslo.kommune.no> <digitalutvikling@gmail.com>
 <petter.goksoyr.asen@kul.oslo.kommune.no> <boutrosboutrosboutros@gmail.com>
 <benjamin.rokseth@kul.oslo.kommune.no>    <bensinober@gmail.com>
+<z.tajoli@cineca.it>               <tajoli@cilea.it>
+<z.tajoli@cineca.it>               <ztajoli@gmail.com>
+<m.de.rooy@rijksmuseum.nl>         <M.de.Rooy@rijksmuseum.nl>
+<m.de.rooy@rijksmuseum.nl>         <marcel@libdevelop.rijksmuseum.nl>