Skip to content

Commit cefd2fb

Browse files
TrottBethGriggs
authored andcommitted
doc: simplify .mailmap file
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>
1 parent d059ed9 commit cefd2fb

File tree

1 file changed

+7
-18
lines changed

1 file changed

+7
-18
lines changed

.mailmap

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,7 @@ Benjamin Waters <benjamin.waters@outlook.com> <ben25890@gmail.com>
5858
Bert Belder <bertbelder@gmail.com> <bert@piscisaureus2.(none)>
5959
Bert Belder <bertbelder@gmail.com> <info@2bs.nl>
6060
Bert Belder <bertbelder@gmail.com> <piscisaureus@Berts-MacBook-Pro.local>
61-
Beth Griggs <bgriggs@redhat.com> Beth Griggs <Bethany.Griggs@uk.ibm.com>
62-
Beth Griggs <bgriggs@redhat.com> Bethany Griggs <Bethany.Griggs@uk.ibm.com>
63-
Beth Griggs <bgriggs@redhat.com> Bethany N Griggs <Bethany.Griggs@uk.ibm.com>
64-
Beth Griggs <bgriggs@redhat.com> BethGriggs <Bethany.Griggs@uk.ibm.com>
61+
Beth Griggs <bgriggs@redhat.com> <Bethany.Griggs@uk.ibm.com>
6562
Bidisha Pyne <pyne.bidisha2017@gmail.com> <bidipyne@in.ibm.com>
6663
bl-ue <bl-ue@users.noreply.github.com> bl-ue <54780737+bl-ue@users.noreply.github.com>
6764
Brad Decker <bhdecker84@gmail.com> brad-decker <bhdecker84@gmail.com>
@@ -286,7 +283,6 @@ Mikael Bourges-Sevenier <mikeseven@gmail.com> <msevenier@motorola.com>
286283
Mike Kaufman <mike.kaufman@microsoft.com> <mkaufman@microsoft.com>
287284
Minqi Pan <pmq2001@gmail.com> P.S.V.R <pmq2001@gmail.com>
288285
Minuk Park <parkm86@gmail.com>
289-
Minwoo Jung <nodecorelab@gmail.com> JungMinu <jmwsoft@gmail.com>
290286
Minwoo Jung <nodecorelab@gmail.com> <jmwsoft@gmail.com>
291287
Minwoo Jung <nodecorelab@gmail.com> <minwoo@nodesource.com>
292288
Miroslav Bajtoš <miroslav@strongloop.com> <miro.bajtos@gmail.com>
@@ -307,8 +303,7 @@ Noah Rose Ledesma <noahroseledesma@seattleacademy.org> <NoahRoseLedesma@seattlea
307303
Oluwaseun Omoyajowo <omoyajowo2015@gmail.com>
308304
Onne Gorter <onne@onnlucky.com>
309305
Paul Querna <pquerna@apache.org> <paul@querna.org>
310-
Pedro Lima <pvsousalima@gmail.com> Pedro Victor <pvsousalima@gmail.com>
311-
Pedro Lima <pvsousalima@gmail.com> Pedro lima <pvsousalima@gmail.com>
306+
Pedro Lima <pvsousalima@gmail.com>
312307
Peng Lyu <penn.lv@gmail.com> rebornix <penn.lv@gmail.com>
313308
Peter Flannery <pflannery@users.noreply.github.com>
314309
Peter Marton <email@martonpeter.com> <peter@risingstack.com>
@@ -375,22 +370,18 @@ Siobhan O'Donovan <siobhan@justshiv.com> justshiv <siobhan@justshiv.com>
375370
Siyuan Gao <siyuangao@gmail.com> r1cebank <siyuangao@gmail.com>
376371
solebox <solekiller@gmail.com> solebox <5013box@gmail.com>
377372
Sreepurna Jasti <sreepurna.jasti@gmail.com> <jsreepur@in.ibm.com>
378-
Sreepurna Jasti <sreepurna.jasti@gmail.com> sreepurnajasti <jsreepur@in.ibm.com>
379-
Sreepurna Jasti <sreepurna.jasti@gmail.com> sreepurnajasti <sreepurna.jasti@gmail.com>
373+
Sreepurna Jasti <sreepurna.jasti@gmail.com> <sreepurna.jasti@gmail.com>
380374
Stanislav Opichal <opichals@gmail.com>
381375
Stefan Budeanu <stefan@budeanu.com> <stefanbu@ca.ibm.com>
382376
Stefan Bühler <stbuehler@web.de>
383377
Stephen Belanger <admin@stephenbelanger.com> <stephen.belanger@datadoghq.com>
384378
Stephen Belanger <admin@stephenbelanger.com> <stephen.belanger@elastic.co>
385379
Steve Mao <maochenyan@gmail.com> <maochenyan@msn.com>
386380
Steven R. Loomis <srloomis@us.ibm.com> <srl@icu-project.org>
387-
Stewart X Addison <sxa@redhat.com> Stewart Addison <sxa@uk.ibm.com>
388-
Stewart X Addison <sxa@redhat.com> sxa555 <sxa@uk.ibm.com>
389-
Stewart X Addison <sxa@redhat.com> Stewart X Addison <sxa@uk.ibm.com>
381+
Stewart X Addison <sxa@redhat.com> <sxa@uk.ibm.com>
390382
Suraiya Hameed <hameedsuraiya@gmail.com> suraiyah <hameedsuraiya@gmail.com>
391383
Suramya shah <shah.suramya@gmail.com> ss22ever <ss22ever@users.noreply.github.com>
392-
Surya Panikkal <surya.com@gmail.com> surya panikkal <surya.com@gmail.com>
393-
Surya Panikkal <surya.com@gmail.com> suryagh <surya.com@gmail.com>
384+
Surya Panikkal <surya.com@gmail.com>
394385
Taehee Kang <hugnosis@gmail.com> hugnosis <hugnosis@gmail.com>
395386
Tanuja-Sawant <f2013658@goa.bits-pilani.ac.in> <thinkbigtanu@gmail.com>
396387
Taylor Woll <taylor.woll@microsoft.com> taylor.woll <tawoll@ntdev.microsoft.com>
@@ -450,10 +441,8 @@ Wyatt Preul <wpreul@gmail.com> geek <wpreul@gmail.com>
450441
Xavier J Ortiz <xavier.ortiz.ch@gmail.com>
451442
xiaoyu <306766053@qq.com> Poker <306766053@qq.com>
452443
Yael Hermon <yaelherm@gmail.com> <yaelhe@wix.com>
453-
Yazhong Liu <yorkiefixer@gmail.com> Yazhong Liu <l900422@vip.qq.com>
454-
Yazhong Liu <yorkiefixer@gmail.com> Yorkie <l900422@vip.qq.com>
455-
Yazhong Liu <yorkiefixer@gmail.com> Yorkie <yorkiefixer@gmail.com>
456-
Yazhong Liu <yorkiefixer@gmail.com> Yorkie Liu <yorkiefixer@gmail.com>
444+
Yazhong Liu <yorkiefixer@gmail.com> <l900422@vip.qq.com>
445+
Yazhong Liu <yorkiefixer@gmail.com>
457446
Yingchen Xue <yingchenxue@qq.com>
458447
Yongsheng Zhang <zyszys98@gmail.com>
459448
Yongsheng Zhang <zyszys98@gmail.com> <17367077526@163.com>

0 commit comments

Comments
 (0)