summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorRamkumar Ramachandra <artagnon@gmail.com>2013-06-05 23:26:00 +0530
committerRamkumar Ramachandra <artagnon@gmail.com>2013-06-05 23:26:00 +0530
commit50f96c1f354bd2c656866423652c6c2d1ef40f0d (patch)
treecf15ef105fe8ac8c7414775ce7ded0b9ff283ae1 /.mailmap
parentauto merge of #6952 : artagnon/rust/contributing-wrap, r=bstrie (diff)
downloadgrust-50f96c1f354bd2c656866423652c6c2d1ef40f0d.tar.gz
grust-50f96c1f354bd2c656866423652c6c2d1ef40f0d.tar.bz2
grust-50f96c1f354bd2c656866423652c6c2d1ef40f0d.tar.xz
.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 <artagnon@gmail.com>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap12
1 files changed, 12 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..637b9ec8c4
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,12 @@
1#
2# This list is used by git-shortlog to aggregate contributions. It is
3# necessary when either the author's full name is not always written
4# the same way, and/or the same author contributes from different
5# email addresses.
6#
7
8Elly Jones <elly@leptoquark.net>
9ILyoan <ilyoan@gmail.com>
10Junyoung Cho <june0.cho@samsung.com>
11Matthijs Hofstra <thiezz@gmail.com>
12Rob Arnold <robarnold@cs.cmu.edu>