summaryrefslogtreecommitdiffhomepage
path: root/.mailmap (follow)
AgeCommit message (Collapse)AuthorFilesLines
2024-02-21.mailmap: Map Dylan's GitHub addressAndrew Clayton1-0/+1
Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
2024-02-20.mailmap: Map some more personal addressesAndrew Clayton1-0/+3
Add more entries for Andrei and Konstantin and an entry for Dan. Reviewed-by: Dan Callahan <d.callahan@f5.com> Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
2024-01-12.mailmap: Add a few more entriesAndrew Clayton1-0/+9
Fix up a mixture of different names/email addresses people have used. You can always see the original names/addresses used by passing --no-mailmap to the various git commands. See gitmailmap(5) Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
2024-01-11.mailmap: Fix up Taryn's email addressAndrew Clayton1-0/+1
Map her GitHub noreply address to her @f5 one. You can always see the original address used by passing --no-mailmap to the various git commands. Note: We don't always need the name field, but we're keeping this file consistent and alphabetically ordered on first name... Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
2023-12-06.mailmap: Set correct address for DanielleAndrew Clayton1-0/+1
Due to GH making a mess of merge commits, it used Danielle's personal email address for the merge, it also used a generic GH address for the committer but we can't do anything about that. However we can fix the 'Author' email address. If for some reason you want to see the original names/addresses used you can generally pass --no-mailmap to git commands. Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
2023-10-25.mailmap: updated address for Alex.Alejandro Colomar1-2/+3
Signed-off-by: Alejandro Colomar <alx@kernel.org> Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
2023-05-21Using names in .mailmap.Alejandro Colomar1-2/+2
In this case, Andrew always committed under the same name, so it's not strictly necessary. This is for consistency, so that it's clearer whose is an email address. It also makes it easier to sort the names alphabetically. Reviewed-by: Andrew Clayton <a.clayton@nginx.com> Signed-off-by: Alejandro Colomar <alx@nginx.com>
2023-05-21Added Alex to .mailmap.Alejandro Colomar1-0/+2
Reviewed-by: Andrew Clayton <a.clayton@nginx.com> Signed-off-by: Alejandro Colomar <alx@nginx.com>
2022-10-03Added a .mailmap file.Andrew Clayton1-0/+2
This file is used by git (maybe also hg) to map different identities. It can be used to map different names/email addresses to a preferred name/email. So if you have authored/committed under different names/email addresses you can map all these to a particular name/email. Certain git commands (log, shortlog, show, blame etc) will consult this file and show the Author/Committer accordingly. Note: This does _not_ change history, this is simply used by various commands to alter their output and can be disabled for some commands with the --no-mailmap option. This can be useful for commands like git shortlog so that all your commits are shown under a single identity and also so people have an up to date email address should they wish to contact you. And just for overall consistency. Seeing as I've already committed under two different email addresses (not counting this one), I've put entries in this file to map my email addresses to my @nginx.com one. See also, gitmailmap(5). Acked-by: Alex Colomar <alx@nginx.com> Signed-off-by: Andrew Clayton <a.clayton@nginx.com>