Merge pull request cri-o#1262 from wking/mailmap

Mrunal Patel · web-flow · commit ba2b4a03d047 · 2018-01-18T10:55:53.000-08:00
.mailmap: Add entries for inconsistent users
diff --git a/.mailmap b/.mailmap
@@ -0,0 +1,10 @@
+Aleksa Sarai <asarai@suse.de> <asarai@suse.com>
+Antonio Murdaca <runcom@redhat.com> <runcom@users.noreply.github.com>
+CuiHaozhi <cuihaozhi@chinacloud.com.cn> <cuihz@wise2c.com>
+Daniel J Walsh <dwalsh@redhat.com>
+Haiyan Meng <hmeng@redhat.com> <haiyanalady@gmail.com>
+Lorenzo Fontana <lo@linux.com> <fontanalorenz@gmail.com>
+Mrunal Patel <mrunalp@gmail.com> <mpatel@redhat.com>
+Mrunal Patel <mrunalp@gmail.com> <mrunal@me.com>
+Pengfei Ni <feiskyer@gmail.com> <feiskyer@users.noreply.github.com>
+Tobias Klauser <tklauser@distanz.ch> <tobias.klauser@gmail.com>

-Original file line number
+Diff line change
@@ @@ -0,0 +1,10 @@ @@
 +Aleksa Sarai <[email protected]> <[email protected]>
 +Antonio Murdaca <[email protected]> <[email protected]>
 +CuiHaozhi <[email protected]> <[email protected]>
 +Daniel J Walsh <[email protected]>
 +Haiyan Meng <[email protected]> <[email protected]>
 +Lorenzo Fontana <[email protected]> <[email protected]>
 +Mrunal Patel <[email protected]> <[email protected]>
 +Mrunal Patel <[email protected]> <[email protected]>
 +Pengfei Ni <[email protected]> <[email protected]>
 +Tobias Klauser <[email protected]> <[email protected]>