Merge pull request #186 from q384566678/mail-map

coolljt0725 · web-flow · commit bc2102bec354 · 2017-10-19T08:50:28.000+08:00
.mailmap: Add entries for inconsistent users
diff --git a/.mailmap b/.mailmap
@@ -0,0 +1,8 @@
+Aleksa Sarai <asarai@suse.de> <cyphar@cyphar.com>
+Brandon Philips <brandon.philips@coreos.com> <brandon@ifup.org>
+Doug Davis <dug@us.ibm.com> <duglin@users.noreply.github.com>
+Sergiusz Urbaniak <sur@coreos.com> <sergiusz.urbaniak@gmail.com>
+Stephen J Day <stephen.day@docker.com> <stevvooe@users.noreply.github.com>
+xiekeyang <xiekeyang@huawei.com> <keyang.xie@gmail.com>
+xiekeyang <xiekeyang@huawei.com> <xiekeyang@users.noreply.github.com>
+Zhou Hao <zhouhao@cn.fujitsu.com>

-Original file line number
+Diff line change
@@ @@ -0,0 +1,8 @@ @@
 +Aleksa Sarai <[email protected]> <[email protected]>
 +Brandon Philips <[email protected]> <[email protected]>
 +Doug Davis <[email protected]> <[email protected]>
 +Sergiusz Urbaniak <[email protected]> <[email protected]>
 +Stephen J Day <[email protected]> <[email protected]>
 +xiekeyang <[email protected]> <[email protected]>
 +xiekeyang <[email protected]> <[email protected]>
 +Zhou Hao <[email protected]>