summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrew Clayton <a.clayton@nginx.com>2022-09-22 21:21:22 +0100
committerAndrew Clayton <a.clayton@nginx.com>2022-10-03 14:16:44 +0100
commit2e69b7eb5712e03a198caa66240c2002175c5ed9 (patch)
treeeb1bf9c6f1e4fd531e6bfdc24a443b3916726eb7
parent97fa587c9f80ecee7bd2e2be173e700d011b09b9 (diff)
downloadunit-2e69b7eb5712e03a198caa66240c2002175c5ed9.tar.gz
unit-2e69b7eb5712e03a198caa66240c2002175c5ed9.tar.bz2
Added a .mailmap file.
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>
Diffstat (limited to '')
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..b96dcabc
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+<a.clayton@nginx.com> <andrew@digital-domain.net>
+<a.clayton@nginx.com> <a.clayton@f5.com>