Add a few more clarifications to .mailmap (#16286)

natecook1000 · web-flow · commit dd17ca090138 · 2018-05-04T15:53:54.000-05:00
diff --git a/.mailmap b/.mailmap
@@ -33,6 +33,8 @@ Dave Abrahams <dabrahams@apple.com> <dave@Skree.local>
 Dave Abrahams <dabrahams@apple.com> <dave@Wingy.local>
 Dave Lee <davelee@lyft.com> <davelee.com@gmail.com>
 David Rönnqvist <david.ronnqvist@gmail.com> <david.ronnqvist@skype.net>
+David Rönnqvist <david.ronnqvist@gmail.com>
+David Ungar <dungar@apple.com> <ungar@mac.com>
 David Zarzycki <dave@znu.io> <zarzycki@apple.com>
 David Zarzycki <dave@znu.io> <zarzycki@icloud.com>
 David Zarzycki <dave@znu.io> <zarzycki@mac.com>
@@ -42,10 +44,10 @@ Dmitri Gribenko <gribozavr@gmail.com> <dgribenko@apple.com>
 Doug Coleman <doug_coleman@apple.com> <doug.coleman@gmail.com>
 Enrico Granata <egranata@apple.com> <egranata@egranata.apple.com>
 Enrico Granata <egranata@apple.com> <granata.enrico@gmail.com>
-Erik Eckstein <eeckstein@apple.com> <eeckstein@apple.com>
+Erik Eckstein <eeckstein@apple.com>
 Erik Eckstein <eeckstein@apple.com> <eeckstein@rad-main.corp.apple.com>
 Erik Verbruggen <erik.verbruggen@me.com> <erikjv@users.noreply.github.com>
-Ewa Matejska <ematejska@apple.com> <ematejska@apple.com>
+Ewa Matejska <ematejska@apple.com>
 Ewa Matejska <ematejska@apple.com> <ematejska@Ewas-MacBook-Pro.local>
 Ewa Matejska <ematejska@apple.com> <ewamatejska@Ewas-iMac.local>
 Florent Bruneau <florent.bruneau@intersec.com> <florent.bruneau_github@m4x.org>
@@ -54,10 +56,10 @@ GauravDS <er.gauravds@gmail.com> <gaurav.sharma@punchh.com>
 Graydon Hoare <ghoare@apple.com> <graydon@users.noreply.github.com>
 Greg Parker <gparker@apple.com> <gparker-github@sealiesoftware.com>
 Guillaume Lessard <dhtnstff@gmail.com> <glessard@users.noreply.github.com>
-Hamish <hamish2knight@gmail.com> <hamish2knight@gmail.com>
+Hamish <hamish2knight@gmail.com>
 Han Sangjin <tinysun@jssolution.co.kr> <tinysun.net@gmail.com>
 Harlan Haskins <harlan@apple.com> <harlan@harlanhaskins.com>
-Hitster GTD <hitstergtd@users.noreply.github.com> <hitstergtd@users.noreply.github.com>
+Hitster GTD <hitstergtd@users.noreply.github.com>
 Huon Wilson <huon@apple.com> <dbau.pp+github@gmail.com>
 Ingmar Stein <IngmarStein@users.noreply.github.com>
 Itai Ferber <iferber@apple.com> <itai@itaiferber.net>
@@ -78,14 +80,18 @@ John Regner <john@johnregner.com> <regnerjr@gmail.com>
 Karoy Lorentey <klorentey@apple.com> <karoly@lorentey.hu>
 Keith Smiley <k@keith.so> <keithbsmiley@gmail.com>
 Kevin Ballard <kevin@sb.org> <kevin.ballard@postmates.com>
+Kevin Saldaña <ksaldana1@gmail.com>
+Kim Topley <ktopley@apple.com>
 Kosuke Ogawa <ogawa_kousuke@aratana.jp> <koogawa.app@gmail.com>
 Kuba Mracek <mracek@apple.com> <jbrecka@apple.com>
+Kuba Mracek <mracek@apple.com>
 Luiz Fernando Silva <luizinho_mack@yahoo.com.br>
 Luqman Aden <luqman@apple.com> <luqman_aden@apple.com>
 Marcelo Fabri <me@marcelofabri.com> <marcelofabri@users.noreply.github.com>
 Mark Lacey <mark.lacey@apple.com> <rudkx@icloud.com>
 Mark Lacey <mark.lacey@apple.com> <rudkx@users.noreply.github.com>
 Matt Rajca <matt.rajca@me.com> <mattrajca@users.noreply.github.com>
+Max Moiseev <moiseev@apple.com>
 Max Moiseev <moiseev@apple.com> <maxim.moiseev@gmail.com>
 Max Moiseev <moiseev@apple.com> <moiseev@users.noreply.github.com>
 Maxwell Swadling <maxs@apple.com> <maxwellswadling@gmail.com>
@@ -116,6 +122,7 @@ Rintaro Ishizaki <rishizaki@apple.com> <fs.output@gmail.com>
 Robert Widmann <rwidmann@apple.com> <devteam.codafi@gmail.com>
 Roman Levenstein <rlevenstein@apple.com> <swiftix@users.noreply.github.com>
 Ross Bayer <ross.m.bayer@gmail.com> <Rostepher@users.noreply.github.com>
+Ross Bayer <ross.m.bayer@gmail.com>
 Russ Bishop <rbishopjr@apple.com> <russ@plangrid.com>
 Ryan Lovelett <ryan@lovelett.me> <RLovelett@users.noreply.github.com>
 Shawn Erickson <shawn.erickson@citrix.com> <shawnce@gmail.com>

-Original file line number
+Diff line change
 Dave Abrahams <[email protected]> <[email protected]>
 Dave Lee <[email protected]> <[email protected]>
 David Rönnqvist <[email protected]> <[email protected]>
 +David Rönnqvist <[email protected]>
 +David Ungar <[email protected]> <[email protected]>
 David Zarzycki <[email protected]> <[email protected]>
 David Zarzycki <[email protected]> <[email protected]>
 David Zarzycki <[email protected]> <[email protected]>
 Doug Coleman <[email protected]> <[email protected]>
 Enrico Granata <[email protected]> <[email protected]>
 Enrico Granata <[email protected]> <[email protected]>
 -Erik Eckstein <[email protected]> <[email protected]>
 +Erik Eckstein <[email protected]>
 Erik Eckstein <[email protected]> <[email protected]>
 Erik Verbruggen <[email protected]> <[email protected]>
 -Ewa Matejska <[email protected]> <[email protected]>
 +Ewa Matejska <[email protected]>
 Ewa Matejska <[email protected]> <[email protected]>
 Ewa Matejska <[email protected]> <[email protected]>
 Florent Bruneau <[email protected]> <[email protected]>
 Graydon Hoare <[email protected]> <[email protected]>
 Greg Parker <[email protected]> <[email protected]>
 Guillaume Lessard <[email protected]> <[email protected]>
 -Hamish <[email protected]> <[email protected]>
 +Hamish <[email protected]>
 Han Sangjin <[email protected]> <[email protected]>
 Harlan Haskins <[email protected]> <[email protected]>
 -Hitster GTD <[email protected]> <[email protected]>
 +Hitster GTD <[email protected]>
 Huon Wilson <[email protected]> <[email protected]>
 Ingmar Stein <[email protected]>
 Itai Ferber <[email protected]> <[email protected]>
 Karoy Lorentey <[email protected]> <[email protected]>
 Keith Smiley <[email protected]> <[email protected]>
 Kevin Ballard <[email protected]> <[email protected]>
 +Kevin Saldaña <[email protected]>
 +Kim Topley <[email protected]>
 Kosuke Ogawa <[email protected]> <[email protected]>
 Kuba Mracek <[email protected]> <[email protected]>
 +Kuba Mracek <[email protected]>
 Luiz Fernando Silva <[email protected]>
 Luqman Aden <[email protected]> <[email protected]>
 Marcelo Fabri <[email protected]> <[email protected]>
 Mark Lacey <[email protected]> <[email protected]>
 Mark Lacey <[email protected]> <[email protected]>
 Matt Rajca <[email protected]> <[email protected]>
 +Max Moiseev <[email protected]>
 Max Moiseev <[email protected]> <[email protected]>
 Max Moiseev <[email protected]> <[email protected]>
 Maxwell Swadling <[email protected]> <[email protected]>
 Robert Widmann <[email protected]> <[email protected]>
 Roman Levenstein <[email protected]> <[email protected]>
 Ross Bayer <[email protected]> <[email protected]>
 +Ross Bayer <[email protected]>
 Russ Bishop <[email protected]> <[email protected]>
 Ryan Lovelett <[email protected]> <[email protected]>
 Shawn Erickson <[email protected]> <[email protected]>