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.

Sign up for GitHub

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

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c744601
meta: consolidate email addresses for szmarczak
Trott Aug 3, 2021
4c50e04
meta: consolidate email addresses for tadjik1
Trott Aug 3, 2021
d491163
meta: consolidate email addresses for MarshallOfSound
Trott Aug 3, 2021
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,7 @@ Sam P Gallagher-Bishop <samgallagherb@gmail.com> <SPGB@users.noreply.github.com>
Sam Roberts <vieuxtech@gmail.com> <sam@strongloop.com>
Sam Shull <brickysam26@gmail.com> <brickysam26@samuel-shulls-computer.local>
Sam Shull <brickysam26@gmail.com> <sshull@squaremouth.com>
Samuel Attard <samuel.r.attard@gmail.com> <sattard@slack-corp.com>
Samantha Sample <ssample812@gmail.com> <=>
Sambasiva Suda <sambasivarao@gmail.com>
San-Tai Hsu <v@fatpipi.com>
Expand All @@ -360,6 +361,7 @@ Saúl Ibarra Corretgé <s@saghul.net> <saghul@gmail.com>
Scott Blomquist <github@scott.blomqui.st> <sblom@microsoft.com>
Segu Riluvan <rilwan22@hotmail.com> <riluvan@gmail.com>
Sergey Kryzhanovsky <skryzhanovsky@gmail.com> <another@dhcp199-223-red.yandex.net>
Sergey Zelenov <mail@zelenov.su> <sergey.zelenov@getyourguide.com>
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 <shannenlaptop@gmail.com>
Shaopeng Zhang <szhang351@bloomberg.net>
Shelley Vohr <shelley.vohr@gmail.com> <codebytere@gmail.com>
Expand All @@ -386,6 +388,7 @@ Stewart X Addison <sxa@redhat.com> <sxa@uk.ibm.com>
Suraiya Hameed <hameedsuraiya@gmail.com>
Suramya shah <shah.suramya@gmail.com> <ss22ever@users.noreply.github.com>
Surya Panikkal <surya.com@gmail.com>
Szymon Marczak <sz.marczak@gmail.com> <36894700+szmarczak@users.noreply.github.com>
Tadashi SAWADA <cesare@mayverse.jp>
Tadhg Creedon <tadhgcreedon@gmail.com> <tadhg.creedon@rangle.io>
Taehee Kang <hugnosis@gmail.com>
Expand Down
3 changes: 0 additions & 3 deletions AUTHORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2791,7 +2791,6 @@ Mike MacCana <mike.maccana@gmail.com>
Tim Baverstock <tim.baverstock@corp.badoo.com>
Walle Cyril <cyril.walle@protonmail.com>
Xu Meng <dmabupt@gmail.com>
Samuel Attard <sattard@slack-corp.com>
Ben L. Titzer <titzer@google.com>
Ojasvi Monga <ojasvi@Ojasvis-MacBook-Air.local>
Shajan Jacob <shajanjp@gmail.com>
Expand Down Expand Up @@ -3008,7 +3007,6 @@ Andrew Neitsch <andrew@neitsch.ca>
RamanandPatil <ramanand.patil@gmail.com>
forfun414 <forfun414@gmail.com>
David Gilbertson <gilbertson.david@gmail.com>
Sergey Zelenov <sergey.zelenov@getyourguide.com>
Eric Bickle <ebickle@users.noreply.github.com>
Joe Pea <joe@trusktr.io>
ExE Boss <3889017+ExE-Boss@users.noreply.github.com>
Expand Down Expand Up @@ -3165,7 +3163,6 @@ krank2me <alejok6@gmail.com>
masx200 <34191203+masx200@users.noreply.github.com>
Baruch Odem (Rothkoff) <baruchiro@gmail.com>
Mattias Runge-Broberg <mattias@runge.se>
Szymon Marczak <36894700+szmarczak@users.noreply.github.com>
Dmitry Semigradsky <semigradskyd@gmail.com>
Ole André Vadla Ravnås <oleavr@gmail.com>
Aleksandr Krutko <Oleksandr.Krutko@ibm.com>
Expand Down