See "Proposal: Adding a toplevel .mailmap file" on llvm-dev:
I was trying to say that with "mapping … email addresses and names to a single canonical one". Do you have a suggestion for how to make that more clear?
Maybe we could add:
For example, if you commit as `email@example.com` but sometimes use "Rañdom Person" and sometimes "Random Person" as name and you want the former to be your canonical name, add Rañdom Person <firstname.lastname@example.org> If you commit as both `email@example.com` and `firstname.lastname@example.org` and you want the former to be your canonical email address, add <email@example.com> <firstname.lastname@example.org> Combinations of both are possible too, see https://git-scm.com/docs/gitmailmap for format details.
Would that help?
Concrete change suggestions for the text that's here are also very welcome :)
Good question. I would've said "whatever :sort does" but I guess it's nice to keep entries for one person together?
But it's already not sorted even with email-only entries, so maybe we should just remove this line *shrug*
https://github.com/torvalds/linux/blob/master/.mailmap looks pretty tidy so I guess using that rule ("by first non-< char") would work?