From a8920e414e994d5ae1739ff622e08eb71ea1566c Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Sat, 18 Jun 2016 14:00:03 -0700 Subject: [PATCH] .mailmap: Add entries for inconsistent users MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 81 Mrunal Patel ... 1 Wang Qilin 5 Wang Qilin 8 liang chenye 8 liangchenye ... 1 梁辰晔 (Liang Chenye) 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 --- .mailmap | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .mailmap diff --git a/.mailmap b/.mailmap new file mode 100644 index 000000000..5389ddeb7 --- /dev/null +++ b/.mailmap @@ -0,0 +1,4 @@ +LinZhinan(Zen Lin) +Mrunal Patel +Wang Qilin +梁辰晔 (Liang Chenye)