ENH - .mailmap file to harmonize git shortlog

matthew-brett · matthew-brett · commit 8ea667dc9a4b · 2012-12-24T08:52:28.000Z
Reduce duplicates in git shortlog
diff --git a/.mailmap b/.mailmap
@@ -0,0 +1,20 @@
+# Prevent git from showing duplicate names with commands like "git shortlog"
+# # See the manpage of git-shortlog for details.
+# # The syntax is:
+# # Name that should be used <email that should be used> Bad name <bad email>
+# #
+# # You can skip Bad name if it is the same as the one that should be used, and is unique.
+# #
+# # This file is up-to-date if the command git log --format="%aN <%aE>" | sort -u
+# # gives no duplicates.
+
+Nathaniel J. Smith <njs@pobox.com> njsmith <njs@pobox.com>
+Ralf Gommers <ralf.gommers@googlemail.com> rgommers <ralf.gommers@googlemail.com>
+Christoph Gohlke <cgohlke@uci.edu> cgholke <?@?>
+Christoph Gohlke <cgohlke@uci.edu> Christolph Gohlke <cgohlke@uci.edu>
+Christoph Gohlke <cgohlke@uci.edu> cgohlke <cgohlke@uci.edu>
+Ondřej Čertík <ondrej.certik@gmail.com> Ondrej Certik <ondrej.certik@gmail.com>
+Mark Wiebe <mwwiebe@gmail.com> Mark <mwwiebe@gmail.com>
+Mark Wiebe <mwwiebe@gmail.com> Mark Wiebe <mwiebe@enthought.com>
+Mark Wiebe <mwwiebe@gmail.com> Mark Wiebe <mwiebe@georg.(none)>
+Han Genuit <hangenuit@gmail.com> Han <hangenuit@gmail.com>

-Original file line number
+Diff line change
@@ @@ -0,0 +1,20 @@ @@
 +# Prevent git from showing duplicate names with commands like "git shortlog"
 +# # See the manpage of git-shortlog for details.
 +# # The syntax is:
 +# # Name that should be used <email that should be used> Bad name <bad email>
 +# #
 +# # You can skip Bad name if it is the same as the one that should be used, and is unique.
 +# #
 +# # This file is up-to-date if the command git log --format="%aN <%aE>" | sort -u
 +# # gives no duplicates.
++
 +Nathaniel J. Smith <[email protected]> njsmith <[email protected]>
 +Ralf Gommers <[email protected]> rgommers <[email protected]>
 +Christoph Gohlke <[email protected]> cgholke <?@?>
 +Christoph Gohlke <[email protected]> Christolph Gohlke <[email protected]>
 +Christoph Gohlke <[email protected]> cgohlke <[email protected]>
 +Ondřej Čertík <[email protected]> Ondrej Certik <[email protected]>
 +Mark Wiebe <[email protected]> Mark <[email protected]>
 +Mark Wiebe <[email protected]> Mark Wiebe <[email protected]>
 +Mark Wiebe <[email protected]> Mark Wiebe <mwiebe@georg.(none)>
 +Han Genuit <[email protected]> Han <[email protected]>