summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorMatthew Brett <matthew.brett@gmail.com>2012-12-24 08:39:42 +0000
committerMatthew Brett <matthew.brett@gmail.com>2012-12-24 08:52:28 +0000
commit8ea667dc9a4bdb2417cf635418da27b6203e8d42 (patch)
treeca49e38c867f663d455222945bbf124ca39ee382 /.mailmap
parent7706227842c5d57804a99ce35ac191be542938da (diff)
downloadpython-numpy-8ea667dc9a4bdb2417cf635418da27b6203e8d42.tar.gz
python-numpy-8ea667dc9a4bdb2417cf635418da27b6203e8d42.tar.bz2
python-numpy-8ea667dc9a4bdb2417cf635418da27b6203e8d42.zip
ENH - .mailmap file to harmonize git shortlog
Reduce duplicates in git shortlog
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap20
1 files changed, 20 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..141243496
--- /dev/null
+++ 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>