Merge pull request #837 from wking/mailmap

Mrunal Patel · web-flow · commit 2ec18c02474d · 2017-05-24T08:10:45.000-07:00
.mailmap: Add entries for inconsistent users
diff --git a/.mailmap b/.mailmap
@@ -0,0 +1,20 @@
+Aleksa Sarai <cyphar@cyphar.com> <asarai@suse.de>
+Alexander Morozov <lk4d4math@gmail.com> <lk4d4@docker.com>
+Amit Saha <amitsaha.in@gmail.com> <amitsaha@users.noreply.github.com>
+Antonio Murdaca <runcom@linux.com> <runcom@redhat.com>
+Brandon Philips <brandon@ifup.org> <brandon.philips@coreos.com>
+Brandon Philips <brandon@ifup.org> <brandon@ifup.co>
+ChengTiesheng <chengtiesheng@huawei.com>
+Daniel, Dao Quang Minh <dqminh89@gmail.com>
+Doug Davis <dug@us.ibm.com> <duglin@users.noreply.github.com>
+John Howard <jhoward@microsoft.com> <John.Howard@microsoft.com>
+LinZhinan(Zen Lin) <linzhinan@huawei.com>
+Mrunal Patel <mrunalp@gmail.com> <mrunal@Mrunals-iMac.local>
+Mrunal Patel <mrunalp@gmail.com> <mrunal@dhcp-16-185.sjc.redhat.com>
+Mrunal Patel <mrunalp@gmail.com> <mrunal@me.com>
+Vincent Batts <vbatts@hashbangbash.com> <vbatts@hashbangbash.com>
+Vincent Batts <vbatts@hashbangbash.com> <vbatts@redhat.com>
+Vishnu Kannan <vishnuk@google.com>
+Vishnu Kannan <vishnuk@google.com> <vishh@users.noreply.github.com>
+Zefan Li <lizefan@huawei.com> <lizf1984@hotmail.com>
+梁辰晔 (Liang Chenye) <liangchenye@huawei.com>

-Original file line number
+Diff line change
@@ @@ -0,0 +1,20 @@ @@
 +Aleksa Sarai <[email protected]> <[email protected]>
 +Alexander Morozov <[email protected]> <[email protected]>
 +Amit Saha <[email protected]> <[email protected]>
 +Antonio Murdaca <[email protected]> <[email protected]>
 +Brandon Philips <[email protected]> <[email protected]>
 +Brandon Philips <[email protected]> <[email protected]>
 +ChengTiesheng <[email protected]>
 +Daniel, Dao Quang Minh <[email protected]>
 +Doug Davis <[email protected]> <[email protected]>
 +John Howard <[email protected]> <[email protected]>
 +LinZhinan(Zen Lin) <[email protected]>
 +Mrunal Patel <[email protected]> <[email protected]>
 +Mrunal Patel <[email protected]> <[email protected]>
 +Mrunal Patel <[email protected]> <[email protected]>
 +Vincent Batts <[email protected]> <[email protected]>
 +Vincent Batts <[email protected]> <[email protected]>
 +Vishnu Kannan <[email protected]>
 +Vishnu Kannan <[email protected]> <[email protected]>
 +Zefan Li <[email protected]> <[email protected]>
 +梁辰晔 (Liang Chenye) <[email protected]>