summaryrefslogtreecommitdiff
path: root/.mailmap
Commit message (Collapse)AuthorAgeFilesLines
* .mailmap: Document file format.Russell Bryant2016-11-171-4/+15
| | | | | | | | | | | | Note that official file format documentation is in git-shortlog(1), but provide a simple quick reference for the two types of entries currently used in this file. A third type of entry was used previously, but this commit simplifies them into one of the two forms documented. Signed-off-by: Russell Bryant <russell@ovn.org> Acked-by: Simon Horman <simon.horman@netronome.com>
* Add .mailmap file.Russell Bryant2016-11-061-0/+74
Create a .mailmap file as described in git-shortlog(1). This is used to map commits that contain different names or email addresses to the same person. This file will automatically be used by git-shortlog. It can also be used by other commands, such as git-log by providing the --use-mailmap option. Signed-off-by: Russell Bryant <russell@ovn.org> Acked-by: Ben Pfaff <blp@ovn.org>