forked from AcademySoftwareFoundation/OpenShadingLanguage
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
admin: Account for duplicate emails in the .mailmap (AcademySoftwareF…
…oundation#1759) Signed-off-by: Larry Gritz <[email protected]>
- Loading branch information
Showing
1 changed file
with
47 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
# 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. | ||
|
||
Adam Martinez <[email protected]> amartinez-cg <[email protected]> | ||
Alejandro Conty <[email protected]> aconty <[email protected]> | ||
Alejandro Conty <[email protected]> Alejandro Conty <[email protected]> | ||
Alex M. Wells <[email protected]> <[email protected]> | ||
Alex M. Wells <[email protected]> <[email protected]> | ||
Alex M. Wells <[email protected]> <[email protected]> | ||
Alexis Oblet <[email protected]> Alexis Oblet <[email protected]> | ||
Brecht Van Lommel <[email protected]> <[email protected]> | ||
Brecht Van Lommel <[email protected]> Brecht Van Lommel <[email protected]> | ||
Chris Kulla <[email protected]> <[email protected]> | ||
Chris Kulla <[email protected]> <[email protected]> | ||
Chris Kulla <[email protected]> Christopher Kulla <[email protected]> | ||
Chris Kulla <[email protected]> fpsunflower <[email protected]> | ||
Clifford Stein <[email protected]> Cliff Stein <[email protected]> | ||
Clifford Stein <[email protected]> cmstein <[email protected]> | ||
Declan Russell <[email protected]> Declan Russell <[email protected]> | ||
Derek Haase <[email protected]> Derek Haase <[email protected]> | ||
Esteban Tovagliari <[email protected]> est77 <[email protected]> | ||
Henri Fousse <[email protected]> darkhorse64 <[email protected]> | ||
Larry Gritz <[email protected]> <[email protected]> | ||
Larry Gritz <[email protected]> <[email protected]> | ||
Roman Zulak <[email protected]> <[email protected]> | ||
Roman Zulak <[email protected]> Frederich Munch <[email protected]> | ||
Roman Zulak <[email protected]> marsupial <[email protected]> | ||
Ronan Keryell <[email protected]> Ronan Keryell <[email protected]> | ||
Steena Monteiro <[email protected]> steena.monteiro <[email protected]> | ||
Sven-Hendrik Haase <[email protected]> Sven-Hendrik Haase <[email protected]> | ||
Tim Grant <[email protected]> Tim Grant <[email protected]> | ||
Tim Grant <[email protected]> timgrant <[email protected]> |