Merge pull request #128 from torbjoernk/feature/add-mailmap

memmett · memmett · commit 3419ae2ad2bd · 2014-12-01T20:51:00.000-08:00
adding .mailmap file to fix up commit authors
diff --git a/.mailmap b/.mailmap
@@ -0,0 +1,6 @@
+Torbjörn Klatt <t.klatt@fz-juelich.de> <torbjoernk@users.noreply.github.com>
+Matthew Emmett <memmett@gmail.com> <matthew@emmett.ca>
+Matthew Emmett <memmett@gmail.com> <mwemmett@lbl.gov>
+Daniel Ruprecht <daniel.ruprecht@usi.ch> danielru <daniel@comp.usilu.net>
+Daniel Ruprecht <daniel.ruprecht@usi.ch> Daniel <daniel@D-Laptop.local>
+Daniel Ruprecht <daniel.ruprecht@usi.ch> Daniel <daniel@comp.usilu.net>

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +Torbjörn Klatt <[email protected]> <[email protected]>
 +Matthew Emmett <[email protected]> <[email protected]>
 +Matthew Emmett <[email protected]> <[email protected]>
 +Daniel Ruprecht <[email protected]> danielru <[email protected]>
 +Daniel Ruprecht <[email protected]> Daniel <[email protected]>
 +Daniel Ruprecht <[email protected]> Daniel <[email protected]>