Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

meta: consolidate email addresses for some individuals with multiple AUTHORS entries #39651

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,7 @@ Sam P Gallagher-Bishop <[email protected]> <[email protected]>
Sam Roberts <[email protected]> <[email protected]>
Sam Shull <[email protected]> <[email protected]>
Sam Shull <[email protected]> <[email protected]>
Samuel Attard <[email protected]> <[email protected]>
Samantha Sample <[email protected]> <=>
Sambasiva Suda <[email protected]>
San-Tai Hsu <[email protected]>
Expand All @@ -360,6 +361,7 @@ Saúl Ibarra Corretgé <[email protected]> <[email protected]>
Scott Blomquist <[email protected]> <[email protected]>
Segu Riluvan <[email protected]> <[email protected]>
Sergey Kryzhanovsky <[email protected]> <[email protected]>
Sergey Zelenov <[email protected]> <[email protected]>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please keep only @zelenov.su, thanks!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please keep only @zelenov.su, thanks!

Thanks.

Just in case it's not clear what's going on here: This .mailmap file entry results in git and other tools treating all instances of the other email address as the same as the @zelenov.su address, which is why the other address is removed from the AUTHORS file in this pull request. The script that generates the AUTHORS file refers to .mailmap to figure out what email address to use for people that have more than one email in the git history.

So I think we're all set.

Shannen Saez <[email protected]>
Shaopeng Zhang <[email protected]>
Shelley Vohr <[email protected]> <[email protected]>
Expand All @@ -386,6 +388,7 @@ Stewart X Addison <[email protected]> <[email protected]>
Suraiya Hameed <[email protected]>
Suramya shah <[email protected]> <[email protected]>
Surya Panikkal <[email protected]>
Szymon Marczak <[email protected]> <[email protected]>
Tadashi SAWADA <[email protected]>
Tadhg Creedon <[email protected]> <[email protected]>
Taehee Kang <[email protected]>
Expand Down
3 changes: 0 additions & 3 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -2791,7 +2791,6 @@ Mike MacCana <[email protected]>
Tim Baverstock <[email protected]>
Walle Cyril <[email protected]>
Xu Meng <[email protected]>
Samuel Attard <[email protected]>
Ben L. Titzer <[email protected]>
Ojasvi Monga <[email protected]>
Shajan Jacob <[email protected]>
Expand Down Expand Up @@ -3008,7 +3007,6 @@ Andrew Neitsch <[email protected]>
RamanandPatil <[email protected]>
forfun414 <[email protected]>
David Gilbertson <[email protected]>
Sergey Zelenov <[email protected]>
Eric Bickle <[email protected]>
Joe Pea <[email protected]>
ExE Boss <[email protected]>
Expand Down Expand Up @@ -3165,7 +3163,6 @@ krank2me <[email protected]>
masx200 <[email protected]>
Baruch Odem (Rothkoff) <[email protected]>
Mattias Runge-Broberg <[email protected]>
Szymon Marczak <[email protected]>
Dmitry Semigradsky <[email protected]>
Ole André Vadla Ravnås <[email protected]>
Aleksandr Krutko <[email protected]>
Expand Down