meta: add mailmap entry for uttampawar

Trott · targos · commit ae3f8b1eda57 · 2021-09-04T15:14:44.000+02:00
This consolidates two email addresses/entries in AUTHORS into one. PR-URL: #39596 Reviewed-By: Ujjwal Sharma <ryzokuken@disroot.org> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
diff --git a/.mailmap b/.mailmap
@@ -429,6 +429,7 @@ Trivikram Kamat <trivikr.dev@gmail.com> <16024985+trivikr@users.noreply.github.c
 ttzztztz <ttzztztz@outlook.com> <yangziyue80@outlook.com>
 Tyler Larson <talltyler@gmail.com>
 Ujjwal Sharma <ryzokuken@disroot.org> <usharma1998@gmail.com>
+Uttam Pawar <upawar@gmail.com> <uttam.c.pawar@intel.com>
 Viktor Karpov <viktor.s.karpov@gmail.com>
 Vincent Voyer <v@fasterize.com>
 Vladimir de Turckheim <vlad2t@hotmail.com>
diff --git a/AUTHORS b/AUTHORS
@@ -1255,7 +1255,7 @@ J Scott Chapman <scott8675309@gmail.com>
 Erez Weiss <ruggertech@gmail.com>
 Scott Smereka <scott.smereka@gmail.com>
 Fabrice Tatieze <fabrice.tatieze@nike.com>
-Uttam Pawar <uttam.c.pawar@intel.com>
+Uttam Pawar <upawar@gmail.com>
 Ben Lugavere <b.lugavere@gmail.com>
 Punit Buch <punit.buch@gmail.com>
 mark hughes <mrhughes@xogrp.com>
@@ -2672,7 +2672,6 @@ Amit Zur <sendwithchibo@gmail.com>
 Thang Tran <trankimthang279@gmail.com>
 Kai <Schweinepriester@users.noreply.github.com>
 Abhishek Agarwal <abhishek.agr31@gmail.com>
-Uttam Pawar <upawar@gmail.com>
 Jon Kunkee <jkunkee@microsoft.com>
 Mukul Khanna <mukul18khanna@gmail.com>
 Jarrod Connolly <jarrod@nestedquotes.ca>

-Original file line number
+Diff line change
 ttzztztz <[email protected]> <[email protected]>
 Tyler Larson <[email protected]>
 Ujjwal Sharma <[email protected]> <[email protected]>
 +Uttam Pawar <[email protected]> <[email protected]>
 Viktor Karpov <[email protected]>
 Vincent Voyer <[email protected]>
 Vladimir de Turckheim <[email protected]>
-Original file line number
+Diff line change
 Erez Weiss <[email protected]>
 Scott Smereka <[email protected]>
 Fabrice Tatieze <[email protected]>
 -Uttam Pawar <uttam.c.pawar@intel.com>
 +Uttam Pawar <upawar@gmail.com>
 Ben Lugavere <[email protected]>
 Punit Buch <[email protected]>
 mark hughes <[email protected]>
 Thang Tran <[email protected]>
 Kai <[email protected]>
 Abhishek Agarwal <[email protected]>
 -Uttam Pawar <[email protected]>
 Jon Kunkee <[email protected]>
 Mukul Khanna <[email protected]>
 Jarrod Connolly <[email protected]>