path: root/.mailmap
diff options
authorKees Cook <keescook@chromium.org>2020-08-08 00:14:36 -0700
committerJonathan Corbet <corbet@lwn.net>2020-08-11 10:45:19 -0600
commit2824a3669fb28324a76bba1d2203f2f11b126124 (patch)
tree7c601100127e7236c33d2b9cc9f973ad9fee0e19 /.mailmap
parent502b675050a506fb966c6f273d2ce42e5d8ddb07 (diff)
mailmap: Update comments for with format and more detalis
Without having first read the git-shortlog man-page, the format of .mailmap may not be immediately obvious. Add comments with pointers to the man-page, along with other details. Signed-off-by: Kees Cook <keescook@chromium.org> Link: https://lore.kernel.org/r/202008080013.58EBD83@keescook Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to '.mailmap')
1 files changed, 7 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index 9b0b9ec3e53e..787df6ec8908 100644
--- a/.mailmap
+++ b/.mailmap
@@ -2,11 +2,16 @@
# This list is used by git-shortlog to fix a few botched name translations
# in the git archive, either because the author's full name was messed up
# and/or not always written the same way, making contributions from the
-# same person appearing not to be so or badly displayed.
+# same person appearing not to be so or badly displayed. Also allows for
+# old email addresses to map to new email addresses.
+# For format details, see "MAPPING AUTHORS" in "man git-shortlog".
+# Please keep this list dictionary sorted.
+# This comment is parsed by git-shortlog:
# repo-abbrev: /pub/scm/linux/kernel/git/
Aaron Durbin <adurbin@google.com>
Adam Oldham <oldhamca@gmail.com>
Adam Radford <aradford@gmail.com>