Update mailmap

tkremenek · tkremenek · commit dfff7ea96cf2 · 2018-05-24T09:34:48.000-07:00
diff --git a/.mailmap b/.mailmap
@@ -1,6 +1,7 @@
 Adrian-Constantin Popescu <epsilon.gamma@gmail.com> <adrian-constantin.popescu@outlook.com>
 Alex Blewitt <alblue@apple.com> <alex.blewitt@gmail.com>
 Alex Hoppen <alex@alexhoppen.de> <alex@ateamer.de>
+Alex Hoppen <alex@alexhoppen.de> <ahoppen@apple.com>>
 Alexis Beingessner <abeingessner@apple.com> <a.beingessner@gmail.com>
 Alper Çugun <github@alper.nl> <alper@users.noreply.github.com>
 Amr Aboelela <amraboelela@gmail.com> <amraboelela@users.noreply.github.com>
@@ -55,10 +56,12 @@ Francis Ricci <fjricci@fb.com> <francisjricci@gmail.com>
 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>
+Greg Titus <gregomni@gmail.com>
 Guillaume Lessard <dhtnstff@gmail.com> <glessard@users.noreply.github.com>
 Hamish <hamish2knight@gmail.com>
 Han Sangjin <tinysun@jssolution.co.kr> <tinysun.net@gmail.com>
 Harlan Haskins <harlan@apple.com> <harlan@harlanhaskins.com>
+Harlan Haskins <harlan@apple.com> <hbh@google.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>
@@ -102,6 +105,7 @@ Michael Ilseman <milseman@apple.com> <michael.ilseman@gmail.com>
 Mike Ash <mikeash@apple.com> <mike@mikeash.com>
 Mike Ferris <mferris@apple.com> <mike@lorax.com>
 Mishal Awadah <mawadah@apple.com>
+Mishal Shah <mishal_shah@apple.com>
 Mishal Shah <mishal_shah@apple.com> <shahmishal@users.noreply.github.com>
 Nadav Rotem <nrotem@apple.com> <nadavrot@users.noreply.github.com>
 Nate Cook <natecook@apple.com> <nate@Nates-MacBook-Pro.local>

-Original file line number
+Diff line change
 Adrian-Constantin Popescu <[email protected]> <[email protected]>
 Alex Blewitt <[email protected]> <[email protected]>
 Alex Hoppen <[email protected]> <[email protected]>
 +Alex Hoppen <[email protected]> <[email protected]>>
 Alexis Beingessner <[email protected]> <[email protected]>
 Alper Çugun <[email protected]> <[email protected]>
 Amr Aboelela <[email protected]> <[email protected]>
 GauravDS <[email protected]> <[email protected]>
 Graydon Hoare <[email protected]> <[email protected]>
 Greg Parker <[email protected]> <[email protected]>
 +Greg Titus <[email protected]>
 Guillaume Lessard <[email protected]> <[email protected]>
 Hamish <[email protected]>
 Han Sangjin <[email protected]> <[email protected]>
 Harlan Haskins <[email protected]> <[email protected]>
 +Harlan Haskins <[email protected]> <[email protected]>
 Hitster GTD <[email protected]>
 Huon Wilson <[email protected]> <[email protected]>
 Ingmar Stein <[email protected]>
 Mike Ash <[email protected]> <[email protected]>
 Mike Ferris <[email protected]> <[email protected]>
 Mishal Awadah <[email protected]>
 +Mishal Shah <[email protected]>
 Mishal Shah <[email protected]> <[email protected]>
 Nadav Rotem <[email protected]> <[email protected]>
 Nate Cook <[email protected]> <[email protected]>