Merge pull request #924 from wking/mailmap

hqhq · web-flow · commit a8125598b32a · 2017-09-27T09:08:35.000+08:00
.mailmap: Consolidate James' entries
diff --git a/.mailmap b/.mailmap
@@ -7,6 +7,7 @@ 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>
+James O. D. Hunt <james.o.hunt@intel.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>

-Original file line number
+Diff line change
 ChengTiesheng <[email protected]>
 Daniel, Dao Quang Minh <[email protected]>
 Doug Davis <[email protected]> <[email protected]>
 +James O. D. Hunt <[email protected]>
 John Howard <[email protected]> <[email protected]>
 LinZhinan(Zen Lin) <[email protected]>
 Mrunal Patel <[email protected]> <[email protected]>