summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinrich Schuchardt <xypron.glpk@gmx.de>2019-08-10 13:17:21 +0200
committerTom Rini <trini@konsulko.com>2019-08-20 12:20:32 -0400
commit2da56af84adfa38fa6b0235e8087c27584b4e817 (patch)
treeefbbfbd381a9a6a96f0e7f6846d66cd6417f150b
parent1425465accfb96b74df400131aeb55665e9d98d2 (diff)
mailmap: provide usage instruction
Looking at the contents of file .mailmap it seems that some editors assumed that translation is done by entering multiple lines into the file and the last one replaces the others. This is not how it works. The translation occurs according to entries in single lines as described in the git-check-mailmap man-page. Add a description of the file format. Add an entry for Alexander Graf as his old email address is not valid anymore. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
-rw-r--r--.mailmap8
1 files changed, 8 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 1bee048d13..dc72f24688 100644
--- a/.mailmap
+++ b/.mailmap
@@ -4,10 +4,18 @@
# and/or not always written the same way, making contributions from the
# same person appearing not to be so or badly displayed.
#
+# This file is also used by scripts/get_maintainer.pl.
+#
# This file can be modified by hand or updated by the following command:
# scripts/mailmapper > tmp; mv tmp .mailmap
#
+# Entries in this file take one of the following forms:
+# Proper Name <commit@email.xx>
+# <proper@email.xx> <commit@email.xx>
+# Proper Name <proper@email.xx> <commit@email.xx>
+# Proper Name <proper@email.xx> Commit Name <commit@email.xx>
+Alexander Graf <agraf@csgraf.de> <agraf@suse.de>
Allen Martin <amartin@nvidia.com>
Andreas Bießmann <andreas.devel@googlemail.com>
Andreas Bießmann <andreas@biessmann.org>