From f4cf1edc3b897c5fbc82b388285de53b7f614ca8 Mon Sep 17 00:00:00 2001 From: Alex Bennée Date: Wed, 28 Aug 2019 12:03:23 +0100 Subject: .mailmap/aliases: add some further commentary The two files are not interchangeable but a change to one *might* require a change to the other so lets flag that up with an explanation of what both files are trying to achieve. While we are at it document the many forms .mailmap can take in the header. Signed-off-by: Alex Bennée Reviewed-by: Aleksandar Markovic --- .mailmap | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to '.mailmap') diff --git a/.mailmap b/.mailmap index d0fc1d793c..0756a0bf66 100644 --- a/.mailmap +++ b/.mailmap @@ -1,4 +1,18 @@ # This mailmap fixes up author names/addresses. +# +# If you are adding to this file consider if a similar change needs to +# be made to contrib/gitdm/aliases. They are not however completely +# analogous. .mailmap is concerned with fixing up damaged author +# fields where as the gitdm equivalent is more concerned with making +# sure multiple email addresses get mapped onto the same author. +# +# From man git-shortlog the forms are: +# +# Proper Name +# +# Proper Name +# Proper Name Commit Name +# # The first section translates weird addresses from the original git import # into proper addresses so that they are counted properly by git shortlog. -- cgit v1.2.3-55-g7522