From 57e18cd2b046ead769bd4801cf5550d44f16d92a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Thu, 22 Jun 2023 21:37:56 +0100 Subject: [PATCH 1/4] Update top-level Git mailmap to normalize commit author variants These updates aim 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 | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 87096ec93b2..d831237ff5e 100644 --- a/.mailmap +++ b/.mailmap @@ -1,12 +1,63 @@ +Aleksandra Tarkowska +Alex Herbert +Alexandr Virodov +Andreas Knab +Andreica Eliana +Andrew Patterson Andrew Patterson +Balaji Ramalingam +Brian Long +Brian Long +Brian Loranger Chris Allan Chris Allan +Christian Niedworok +Christian Sachs +Christian Sachs +Claire McQuin +Colin Blackburn +Colin Blackburn Curtis Rueden +Constanze Wendtland +Constanze Wendtland <88091453+XLEFReaderForBioformats@users.noreply.github.com> +David Gault +David Pinto +Donald MacDonald +Helen Flynn +Ian Munro +Jan Eglinger Jean-Marie Burel +Jean-Yves Tinevez +Jeremy Muhlich +Jim Crowe +Johan Herz <45658761+LambertJohan@users.noreply.github.com> Johannes Schindelin -Josh Moore +Josh Moore +Josh Moore +Kristian Kjærgaard Kristin Briney +Mark Carroll Mark Hiner +Mark Kittisopikul +Matthieu Moisse Melissa Linkert +Nicholas Chiaruttini +Nicholas Papp +Nils Gladitz +Paul van Schayck +Pete Bankhead Premysl Fiala +Richard Myers +Richard Myers Roger Leigh +Roger Leigh +Roger Leigh +Sébastien Besson +Shaquille Louisa <118732057+ShaquilleLouisa-LambertInstruments@users.noreply.github.com> +Simone Leo +Stefan Helfrich +Stefan Helfrich +Stefan Wagner-Conrad <46338941+swg08@users.noreply.github.com> +Tomas Farago +Wim Pomp +Zach Marin From d51cfa912bec0a97836de6d3904ba4b43c6fd7db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Fri, 23 Jun 2023 06:36:16 +0100 Subject: [PATCH 2/4] Fix typos --- .mailmap | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.mailmap b/.mailmap index d831237ff5e..3f78839e891 100644 --- a/.mailmap +++ b/.mailmap @@ -2,7 +2,6 @@ Aleksandra Tarkowska Alex Herbert Alexandr Virodov Andreas Knab -Andreica Eliana Andrew Patterson Andrew Patterson Balaji Ramalingam @@ -23,6 +22,7 @@ Constanze Wendtland <88091453+XLEFR David Gault David Pinto Donald MacDonald +Eliana Andreica Helen Flynn Ian Munro Jan Eglinger @@ -42,7 +42,7 @@ Mark Kittisopikul Melissa Linkert Nicholas Chiaruttini -Nicholas Papp +Nicola Papp Nils Gladitz Paul van Schayck Pete Bankhead @@ -57,7 +57,7 @@ Shaquille Louisa <118732057+ShaquilleLouisa-L Simone Leo Stefan Helfrich Stefan Helfrich -Stefan Wagner-Conrad <46338941+swg08@users.noreply.github.com> +Stephan Wagner-Conrad <46338941+swg08@users.noreply.github.com> Tomas Farago Wim Pomp Zach Marin From f86a378a3550659cb4c1fea66eba134c803732ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Fri, 23 Jun 2023 08:59:41 +0100 Subject: [PATCH 3/4] Add mapping for additional external contributors --- .mailmap | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 3f78839e891..433a99ef433 100644 --- a/.mailmap +++ b/.mailmap @@ -1,3 +1,4 @@ +Aaron Avery Aleksandra Tarkowska Alex Herbert Alexandr Virodov @@ -25,12 +26,13 @@ Donald MacDonald Helen Flynn Ian Munro +Ilya Parmon Jan Eglinger Jean-Marie Burel Jean-Yves Tinevez Jeremy Muhlich Jim Crowe -Johan Herz <45658761+LambertJohan@users.noreply.github.com> +Johan Herz <45658761+LambertJohan@users.noreply.github.com> Johannes Schindelin Josh Moore Josh Moore From 80d0f4279e47d59338e98905613a547de7528e68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Mon, 26 Jun 2023 13:40:28 +0100 Subject: [PATCH 4/4] Use verbose form for mapping different real names --- .mailmap | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/.mailmap b/.mailmap index 433a99ef433..f15b05f4e68 100644 --- a/.mailmap +++ b/.mailmap @@ -1,54 +1,57 @@ -Aaron Avery +Aaron Avery Aleksandra Tarkowska -Alex Herbert +Alex Herbert aherbert Alexandr Virodov Andreas Knab -Andrew Patterson +Andrew Patterson Andrew J Patterson Andrew Patterson -Balaji Ramalingam -Brian Long +Balaji Ramalingam bramalingam +Brian Long berl Brian Long Brian Loranger Chris Allan Chris Allan -Christian Niedworok +Christian Niedworok cniedwor Christian Sachs Christian Sachs -Claire McQuin +Claire McQuin mcquin Colin Blackburn Colin Blackburn Curtis Rueden Constanze Wendtland Constanze Wendtland <88091453+XLEFReaderForBioformats@users.noreply.github.com> -David Gault +David Gault dgault David Pinto Donald MacDonald -Eliana Andreica +Eliana Andreica dinelia +Eliana Andreica ANDREICA Eliana Helen Flynn -Ian Munro -Ilya Parmon +Ian Munro imunro +Ilya Parmon Parm0n Jan Eglinger -Jean-Marie Burel +Jean-Marie Burel jburel +Jean-Marie Burel jean-marie burel Jean-Yves Tinevez Jeremy Muhlich -Jim Crowe +Jim Crowe redcrow Johan Herz <45658761+LambertJohan@users.noreply.github.com> Johannes Schindelin Josh Moore Josh Moore -Kristian Kjærgaard -Kristin Briney +Kristian Kjaergaard kkjaergaard +Kristin Briney Kristin Mark Carroll Mark Hiner Mark Kittisopikul -Matthieu Moisse +Matthieu Moisse mmoisse Melissa Linkert Nicholas Chiaruttini -Nicola Papp +Nicola Papp nicola Nils Gladitz -Paul van Schayck -Pete Bankhead -Premysl Fiala +Paul van Schayck pvc-local +Peter Bankhead Pete +Premysl Fiala PremyslFiala +Premysl Fiala Premysl.Fiala Richard Myers Richard Myers Roger Leigh @@ -62,4 +65,4 @@ Stefan Helfrich <46338941+swg08@users.noreply.github.com> Tomas Farago Wim Pomp -Zach Marin +Zachary Connerty-Marin zacsimile