From 856c1ca179243433ba861eff6c535aff69596726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Thu, 22 Jun 2023 22:28:28 +0100 Subject: [PATCH 1/2] Add top-level Git mailmap to normalize commit author variants This mapping file aims to associate all commits from the same contributor to a single "First Name Last Name " author line. The University of Dundee or the Glencoe Software email address are used as the canonical address for current employees of these institutions. For contributors with an executed CLA, the email address specified in the CLA is used as the canonical one. --- .mailmap | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .mailmap diff --git a/.mailmap b/.mailmap new file mode 100644 index 000000000..8ce5d8079 --- /dev/null +++ b/.mailmap @@ -0,0 +1,24 @@ +Aleksandra Tarkowska +Anna Hamacher <61734239+abhamacher@users.noreply.github.com> +Carsten Fortmann-Grote +Carlos Neves +Chris Allan +Christian Evenhuis +Colin Blackburn +Colin Blackburn +Donald MacDonald +Emil Rozbicki +Helen Flynn +Jean-Marie Burel +Jean-Marie Burel +Josh Moore +Josh Moore +Josh Moore +Josh Moore +Mark Carroll +Nikolas Ehrenfeuchter +Petr Walczysko +Sébastien Besson +Will Moore +Will Moore +Will Moore From 28552d777b66827d97414b37e20b32e0a4310c1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Tue, 27 Jun 2023 08:58:55 +0100 Subject: [PATCH 2/2] Use verbose form for mapping commits with different real names --- .mailmap | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.mailmap b/.mailmap index 8ce5d8079..9d1fd8608 100644 --- a/.mailmap +++ b/.mailmap @@ -9,7 +9,7 @@ Colin Blackburn Emil Rozbicki Helen Flynn -Jean-Marie Burel +Jean-Marie Burel jburel Jean-Marie Burel Josh Moore Josh Moore @@ -17,8 +17,8 @@ Josh Moore Josh Moore Mark Carroll Nikolas Ehrenfeuchter -Petr Walczysko +Petr Walczysko pwalczysko Sébastien Besson -Will Moore +Will Moore William Moore Will Moore Will Moore