Skip to content

Commit

Permalink
.mailmap: Add entries for inconsistent users
Browse files Browse the repository at this point in the history
Where the same user had multiple entries, I mostly went with whichever
entry had the most non-merge commits.  Before this commit:

  $ git shortlog -se --no-merges
      ...
       5  Mrunal Patel <mrunal@me.com>
      81  Mrunal Patel <mrunalp@gmail.com>
      ...
       1  Wang Qilin <qilin.wang@huawei.com>
       5  Wang Qilin <wangqilin2@huawei.com>
       8  liang chenye <liangchenye@huawei.com>
       8  liangchenye <liangchenye@huawei.com>
      ...
       1  梁辰晔 (Liang Chenye) <liangchenye@huawei.com>

With Liang, I went with the version that also included the logograms,
because logograms are cool and it matches his GitHub name [1] ;).

The order is alphabetical according to Emacs' sort-lines ;).

Details on the format in git-shortlog(1).

[1]: https://github.com/liangchenye

Signed-off-by: W. Trevor King <wking@tremily.us>
  • Loading branch information
wking committed Jun 18, 2016
1 parent da4db68 commit a8920e4
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions .mailmap
@@ -0,0 +1,4 @@
LinZhinan(Zen Lin) <linzhinan@huawei.com>
Mrunal Patel <mrunalp@gmail.com> <mrunal@me.com>
Wang Qilin <wangqilin2@huawei.com> <qilin.wang@huawei.com>
梁辰晔 (Liang Chenye) <liangchenye@huawei.com>

0 comments on commit a8920e4

Please sign in to comment.