From 50f96c1f354bd2c656866423652c6c2d1ef40f0d Mon Sep 17 00:00:00 2001 From: Ramkumar Ramachandra Date: Wed, 5 Jun 2013 23:26:00 +0530 Subject: [PATCH] .mailmap: tolerate different names, emails in shortlog Write a conservative .mailmap as an example for contributors to write their preferred names/ email addresses to. This patch makes no assumptions about the same author using different email addresses, and only collects cases where the full-name of the person is spelt differently for the same email address. Verify with: $ git shortlog -se | cut -f 2 | cut -d\< -f 2 | sort | uniq -d It only assumes that the author prefers the full-name that appears dominantly, by number of contributions. For the purposes of merging, a strictly alphabetical ordering is advised. See MAPPING AUTHORS section of git-shortlog(1) to understand the format of this file. Signed-off-by: Ramkumar Ramachandra --- .mailmap | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .mailmap diff --git a/.mailmap b/.mailmap new file mode 100644 index 00000000000..637b9ec8c4e --- /dev/null +++ b/.mailmap @@ -0,0 +1,12 @@ +# +# This list is used by git-shortlog to aggregate contributions. It is +# necessary when either the author's full name is not always written +# the same way, and/or the same author contributes from different +# email addresses. +# + +Elly Jones +ILyoan +Junyoung Cho +Matthijs Hofstra +Rob Arnold