Merge pull request #35460 from beccadax/im-going-to-enjoy-watching-you-die-mr-anderson

swift-ci · web-flow · commit a6b85522f5d2 · 2021-01-16T16:52:11.000-08:00
diff --git a/.mailmap b/.mailmap
@@ -9,11 +9,11 @@ Ankit Aggarwal <ankit_aggarwal@apple.com> <ankit.spd@gmail.com>
 Argyrios Kyrtzidis <kyrtzidis@apple.com> <akyrtzi@gmail.com>
 Arsen Gasparyan <to.arsen.gasparyan@gmail.com> <frootloops@users.noreply.github.com>
 Ashley Garland <acgarland@apple.com> <dfarler@apple.com>
+Becca Royal-Gordon <beccadax@apple.com> <broyalgordon@apple.com> <becca@beccadax.com> <brentdax@apple.com> <brent@brentdax.com>
 Ben Cohen <ben_cohen@apple.com>
 Ben Cohen <ben_cohen@apple.com> <airspeedswift@users.noreply.github.com>
 Ben Cohen <ben_cohen@apple.com> <ben@airspeedvelocity.net>
 Ben Langmuir <blangmuir@apple.com> <ben.langmuir@gmail.com>
-Brent Royal-Gordon <brent@brentdax.com> <brent@architechies.com>
 Brian Croom <bcroom@apple.com> <brian.s.croom@gmail.com>
 Brian Gesiak <bgesiak@fb.com> <modocache@gmail.com>
 Bryan Chan <bryan.chan@ca.ibm.com> <bryanpkc@gmail.com>

-Original file line number
+Diff line change
 Argyrios Kyrtzidis <[email protected]> <[email protected]>
 Arsen Gasparyan <[email protected]> <[email protected]>
 Ashley Garland <[email protected]> <[email protected]>
 +Becca Royal-Gordon <[email protected]> <[email protected]> <[email protected]> <[email protected]> <[email protected]>
 Ben Cohen <[email protected]>
 Ben Cohen <[email protected]> <[email protected]>
 Ben Cohen <[email protected]> <[email protected]>
 Ben Langmuir <[email protected]> <[email protected]>
 -Brent Royal-Gordon <[email protected]> <[email protected]>
 Brian Croom <[email protected]> <[email protected]>
 Brian Gesiak <[email protected]> <[email protected]>
 Bryan Chan <[email protected]> <[email protected]>