Skip to content

Commit

Permalink
doc: simplify .mailmap file
Browse files Browse the repository at this point in the history
We have a few cases in .mailmap where multiple entries are used where
a single one would do. Consolidate those entries.

PR-URL: #39418
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
Trott authored and targos committed Sep 4, 2021
1 parent 69b56a3 commit ae97a96
Showing 1 changed file with 7 additions and 18 deletions.
25 changes: 7 additions & 18 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,7 @@ Benjamin Waters <benjamin.waters@outlook.com> <ben25890@gmail.com>
Bert Belder <bertbelder@gmail.com> <bert@piscisaureus2.(none)>
Bert Belder <bertbelder@gmail.com> <info@2bs.nl>
Bert Belder <bertbelder@gmail.com> <piscisaureus@Berts-MacBook-Pro.local>
Beth Griggs <bgriggs@redhat.com> Beth Griggs <Bethany.Griggs@uk.ibm.com>
Beth Griggs <bgriggs@redhat.com> Bethany Griggs <Bethany.Griggs@uk.ibm.com>
Beth Griggs <bgriggs@redhat.com> Bethany N Griggs <Bethany.Griggs@uk.ibm.com>
Beth Griggs <bgriggs@redhat.com> BethGriggs <Bethany.Griggs@uk.ibm.com>
Beth Griggs <bgriggs@redhat.com> <Bethany.Griggs@uk.ibm.com>
Bidisha Pyne <pyne.bidisha2017@gmail.com> <bidipyne@in.ibm.com>
bl-ue <bl-ue@users.noreply.github.com> bl-ue <54780737+bl-ue@users.noreply.github.com>
Brad Decker <bhdecker84@gmail.com> brad-decker <bhdecker84@gmail.com>
Expand Down Expand Up @@ -286,7 +283,6 @@ Mikael Bourges-Sevenier <mikeseven@gmail.com> <msevenier@motorola.com>
Mike Kaufman <mike.kaufman@microsoft.com> <mkaufman@microsoft.com>
Minqi Pan <pmq2001@gmail.com> P.S.V.R <pmq2001@gmail.com>
Minuk Park <parkm86@gmail.com>
Minwoo Jung <nodecorelab@gmail.com> JungMinu <jmwsoft@gmail.com>
Minwoo Jung <nodecorelab@gmail.com> <jmwsoft@gmail.com>
Minwoo Jung <nodecorelab@gmail.com> <minwoo@nodesource.com>
Miroslav Bajtoš <miroslav@strongloop.com> <miro.bajtos@gmail.com>
Expand All @@ -307,8 +303,7 @@ Noah Rose Ledesma <noahroseledesma@seattleacademy.org> <NoahRoseLedesma@seattlea
Oluwaseun Omoyajowo <omoyajowo2015@gmail.com>
Onne Gorter <onne@onnlucky.com>
Paul Querna <pquerna@apache.org> <paul@querna.org>
Pedro Lima <pvsousalima@gmail.com> Pedro Victor <pvsousalima@gmail.com>
Pedro Lima <pvsousalima@gmail.com> Pedro lima <pvsousalima@gmail.com>
Pedro Lima <pvsousalima@gmail.com>
Peng Lyu <penn.lv@gmail.com> rebornix <penn.lv@gmail.com>
Peter Flannery <pflannery@users.noreply.github.com>
Peter Marton <email@martonpeter.com> <peter@risingstack.com>
Expand Down Expand Up @@ -375,22 +370,18 @@ Siobhan O'Donovan <siobhan@justshiv.com> justshiv <siobhan@justshiv.com>
Siyuan Gao <siyuangao@gmail.com> r1cebank <siyuangao@gmail.com>
solebox <solekiller@gmail.com> solebox <5013box@gmail.com>
Sreepurna Jasti <sreepurna.jasti@gmail.com> <jsreepur@in.ibm.com>
Sreepurna Jasti <sreepurna.jasti@gmail.com> sreepurnajasti <jsreepur@in.ibm.com>
Sreepurna Jasti <sreepurna.jasti@gmail.com> sreepurnajasti <sreepurna.jasti@gmail.com>
Sreepurna Jasti <sreepurna.jasti@gmail.com> <sreepurna.jasti@gmail.com>
Stanislav Opichal <opichals@gmail.com>
Stefan Budeanu <stefan@budeanu.com> <stefanbu@ca.ibm.com>
Stefan Bühler <stbuehler@web.de>
Stephen Belanger <admin@stephenbelanger.com> <stephen.belanger@datadoghq.com>
Stephen Belanger <admin@stephenbelanger.com> <stephen.belanger@elastic.co>
Steve Mao <maochenyan@gmail.com> <maochenyan@msn.com>
Steven R. Loomis <srloomis@us.ibm.com> <srl@icu-project.org>
Stewart X Addison <sxa@redhat.com> Stewart Addison <sxa@uk.ibm.com>
Stewart X Addison <sxa@redhat.com> sxa555 <sxa@uk.ibm.com>
Stewart X Addison <sxa@redhat.com> Stewart X Addison <sxa@uk.ibm.com>
Stewart X Addison <sxa@redhat.com> <sxa@uk.ibm.com>
Suraiya Hameed <hameedsuraiya@gmail.com> suraiyah <hameedsuraiya@gmail.com>
Suramya shah <shah.suramya@gmail.com> ss22ever <ss22ever@users.noreply.github.com>
Surya Panikkal <surya.com@gmail.com> surya panikkal <surya.com@gmail.com>
Surya Panikkal <surya.com@gmail.com> suryagh <surya.com@gmail.com>
Surya Panikkal <surya.com@gmail.com>
Taehee Kang <hugnosis@gmail.com> hugnosis <hugnosis@gmail.com>
Tanuja-Sawant <f2013658@goa.bits-pilani.ac.in> <thinkbigtanu@gmail.com>
Taylor Woll <taylor.woll@microsoft.com> taylor.woll <tawoll@ntdev.microsoft.com>
Expand Down Expand Up @@ -450,10 +441,8 @@ Wyatt Preul <wpreul@gmail.com> geek <wpreul@gmail.com>
Xavier J Ortiz <xavier.ortiz.ch@gmail.com>
xiaoyu <306766053@qq.com> Poker <306766053@qq.com>
Yael Hermon <yaelherm@gmail.com> <yaelhe@wix.com>
Yazhong Liu <yorkiefixer@gmail.com> Yazhong Liu <l900422@vip.qq.com>
Yazhong Liu <yorkiefixer@gmail.com> Yorkie <l900422@vip.qq.com>
Yazhong Liu <yorkiefixer@gmail.com> Yorkie <yorkiefixer@gmail.com>
Yazhong Liu <yorkiefixer@gmail.com> Yorkie Liu <yorkiefixer@gmail.com>
Yazhong Liu <yorkiefixer@gmail.com> <l900422@vip.qq.com>
Yazhong Liu <yorkiefixer@gmail.com>
Yingchen Xue <yingchenxue@qq.com>
Yongsheng Zhang <zyszys98@gmail.com>
Yongsheng Zhang <zyszys98@gmail.com> <17367077526@163.com>
Expand Down

0 comments on commit ae97a96

Please sign in to comment.