Renamed my past self in commit authorship and mentioned that in the contributing...

diff --git a/.mailmap b/.mailmap
new file mode 100644 (file)
index 0000000..01f7262
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+Maria Matejka <mq@ucw.cz>
+Maria Matejka <mq@jmq.cz>

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ecdc3d3514daa708d2ce0adba22d7df2bbbceced..8651b145422df0e8ac49449ab14bfd4754d9f78d 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -90,7 +90,10 @@ The credits are scattered over all the source code files; in the commentary
 section, you may find typically the original authors of these files or some
 major contributors who felt like adding their names there. Overall, if you feel
 like your name should be there, include this change in your commits please.
-If your name should be changed, please do that change there.
+
+If your name should be changed, please do that change in the source code files.
+If your name should be changed in the displayed git commit author / commiter
+logs, please submit a patch on the `.mailmap` file.
 
 We are planning to centralize the credits one day; we'll then update this file
 accordingly.