Skip to content

Commit

Permalink
Account for duplicate emails with .mailmap
Browse files Browse the repository at this point in the history
The .mailmap file maps author/committer names and emails to canonical
real names and email addresses.

This also updates the CONTRIBUTORS.md file with missing names from the
git logs.

This information is to the best of our knowledge, but please submit
any corrections if you prefer.

Signed-off-by: Cary Phillips <[email protected]>
  • Loading branch information
cary-ilm committed Dec 18, 2023
1 parent 642312b commit f6a5738
Show file tree
Hide file tree
Showing 2 changed files with 126 additions and 31 deletions.
78 changes: 78 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright (c) Contributors to the OpenEXR Project.
#
# This file establishes email equivalences so we can resolve what look like
# multiple authors, but actually are the same author who has used multiple
# emails over the course of their involvement with the project.
#
# The format is any of the following:
# <CANONICAL-EMAIL> <alternate-email>
# CANONICAL-NAME <CANONICAL-EMAIL> <alternate-email>
# CANONICAL-NAME <CANONICAL-EMAIL> alternate-name <alternate-email>
#
# You can check for duplicates with this command:
# git shortlog -sne --all
# That command (and others) will use this file to collapse the duplicates.
#
# If you see any duplicates we don't account for here, or if you look at your
# own entry here and want a different name or email to be your canonical one
# (we may not have guessed correctly and matched your preferences), please
# file a PR with the edits to this file.

Andrew Kunz <[email protected]>
Antonio Rojas <[email protected]>
Bernd <[email protected]>
Brecht Van Lommel <[email protected]>
CAHEK7 <[email protected]>
Cary Phillips <[email protected]>
Christina Tempelaar-Lietz <[email protected]>
Christopher Kulla <[email protected]>
Daniel Kaneider <[email protected]>
Dirk Lemstra <[email protected]>
Ed Hanway <[email protected]> Ed Hanway <[email protected]>
Eric Wimmer <[email protected]>
Florian Kainz <[email protected]>
Gregorio Litenstein <[email protected]>
Harry Mallon <[email protected]>
Huibean Luo <[email protected]>
Jean-Marie Aubry <[email protected]>
Jens Lindgren <[email protected]>
Ji Hun Yu <[email protected]>
Jonathan Stone <[email protected]>
Jules Maselbas <[email protected]>
Kazuki Sakamoto <[email protected]>
Kimball Thurston <[email protected]>
Larry Gritz <[email protected]>
Liam Fernandez <[email protected]>
Lucas Miller <[email protected]> Lucas Miller <[email protected]>
Mark Sisson <[email protected]>
Mathieu Malaterre <[email protected]>
Mathieu Westphal <[email protected]>
Matthäus G. Chajdas <[email protected]>
Matthias C. M. Troffaes <[email protected]>
Nicholas Yue <[email protected]>
Nick Porcino <[email protected]> meshula <[email protected]>
Nick Porcino <[email protected]> nporcino-pixar <[email protected]>
Nick Rasmussen <[email protected]> Nick Rasmussen <[email protected]>
Nick Rasmussen <[email protected]> Nick Rasmussen <[email protected]>
Nicolas Chauvet <[email protected]>
Nigel Stewart <[email protected]>
OgreTransporter <[email protected]>
Owen Thompson <[email protected]> owdt <[email protected]>
Owen Thompson <[email protected]>
Peter Hillman <[email protected]>
Phyrexian <[email protected]>
Piotr Barejko <[email protected]>
Piotr Stanczyk <[email protected]>
Ralph Potter <[email protected]>
Richard Hobbes <[email protected]>
Simon Boorer <[email protected]>
Thanh Ha <[email protected]>
Thorsten Kaufmann <[email protected]>
Transporter <[email protected]>
Vertexwahn <[email protected]>
Xiao Zhai <[email protected]>
Yujie Shu <[email protected]>
Yuya Asano <[email protected]>
Zachary Klein <[email protected]>
すけや <[email protected]>
79 changes: 48 additions & 31 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,52 @@
This is a list of contributors to the Imath project, sorted
alphabetically by first name.

If you know of missing, please email: [email protected].
If you know of missing, please email [email protected] ro submit a PR.

* Andrew Kunz
* Antonio Rojas
* Cary Phillips
* Christina Tempelaar-Lietz
* Daniel Kaneider
* Ed Hanway
* Eric Wimmer
* Florian Kainz
* Gregorio Litenstein
* Harry Mallon
* Huibean Luo
* Jens Lindgren
* Ji Hun Yu
* Jonathan Stone
* Kimball Thurston
* Larry Gritz
* Liam Fernandez
* Mark Sisson
* Nicholas Yue
* Nick Porcino
* Nick Rasmussen
* Nicolas Chauvet
* Owen Thompson
* Peter Hillman
* Piotr Stanczyk
* Ralph Potter
* Simon Boorer
* Thanh Ha
* Thorsten Kaufmann
* Yujie Shu
* Andrew Kunz
* Antonio Rojas
* Brecht Van Lommel
* Cary Phillips
* Christina Tempelaar-Lietz
* Christopher Kulla
* Daniel Kaneider
* Dirk Lemstra
* Ed Hanway
* Eric Wimmer
* Florian Kainz
* Gregorio Litenstein
* Harry Mallon
* Huibean Luo
* Jean-Marie Aubry
* Jens Lindgren
* Ji Hun Yu
* Jonathan Stone
* Jules Maselbas
* Kazuki Sakamoto
* Kimball Thurston
* Larry Gritz
* Liam Fernandez
* Lucas Miller
* Mark Sisson
* Mathieu Malaterre
* Mathieu Westphal
* Matthäus G. Chajdas
* Matthias C. M. Troffaes
* Nicholas Yue
* Nick Porcino
* Nick Rasmussen
* Nicolas Chauvet
* Nigel Stewart
* Owen Thompson
* Peter Hillman
* Piotr Barejko
* Piotr Stanczyk
* Ralph Potter
* Richard Hobbes
* Simon Boorer
* Thanh Ha
* Thorsten Kaufmann
* Xiao Zhai
* Yujie Shu
* Yuya Asano
* Zachary Klein

0 comments on commit f6a5738

Please sign in to comment.