Added .mailmap

pyllyukko · Apr 4, 2017 · 563c4c6 · 563c4c6
1 parent 3941494
commit 563c4c6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.mailmap b/.mailmap
@@ -0,0 +1,2 @@
+CHEF-KOCH <CHEF-KOCH@users.noreply.github.com> <Nvinside@gmail.com>
+Francois Marier <francois@mozilla.com> <francois@debian.org>
diff --git a/Makefile b/Makefile
@@ -53,6 +53,5 @@ cleanup: sourceprefs.js
 
 authors:
 	@# generate an AUTHORS file, ordered by number of commits
-	@# TODO: add a .mailmap file to deduplicate authors with multiple email addresses
 	@# to add extra authors/credits, git commit --allow-empty --author="A U Thor <author@example.com>"
 	@git shortlog -sne | cut -f1 --complement >| AUTHORS