diff options
| author | Ralf Gommers <ralf.gommers@googlemail.com> | 2012-12-26 05:47:55 -0800 |
|---|---|---|
| committer | Ralf Gommers <ralf.gommers@googlemail.com> | 2012-12-26 05:47:55 -0800 |
| commit | 9fba6c53301852ebf9d238752653a8b4e2247b26 (patch) | |
| tree | 56105bac883a7c2c45333e1002d252254578b214 | |
| parent | 3abd8699dc3c71e389356ca6d80a2cb9efa16151 (diff) | |
| parent | 8ea667dc9a4bdb2417cf635418da27b6203e8d42 (diff) | |
| download | numpy-9fba6c53301852ebf9d238752653a8b4e2247b26.tar.gz | |
Merge pull request #2852 from matthew-brett/add-mailmap
ENH - .mailmap file to harmonize git shortlog
| -rw-r--r-- | .mailmap | 20 |
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> |