Merge pull request #516 from GrahamLea/mailmap

Phillip Webb · Phillip Webb · commit 1697cd15b263 · 2014-04-18T09:49:16.000+01:00
* mailmap:
  Added a Git .mailmap file
diff --git a/.mailmap b/.mailmap
@@ -0,0 +1,13 @@
+Juergen Hoeller <jhoeller@vmware.com> jhoeller <jhoeller@vmware.com>
+<rstoyanchev@gopivotal.com> <rstoyanchev@vmware.com>
+<pwebb@gopivotal.com> <pwebb@vmware.com>
+<cbeams@gopivotal.com> <cbeams@vmware.com>
+<cbeams@gopivotal.com> <cbeams@gmail.com>
+<apoutsma@gopivotal.com> <apoutsma@vmware.com>
+<apoutsma@gopivotal.com> <poutsma@mac.com>
+<ogierke@gopivotal.com> <ogierke@vmware.com>
+<aclement@gopivotal.com> <david_syer@hotmail.com>
+<aclement@gopivotal.com> <andrew.clement@gmail.com>
+<aclement@gopivotal.com> <aclement@vmware.com>
+<dmitry.katsubo@gmail.com> <dmitry.katsubo@gmai.com>
+Nick Williams <nicholas@nicholaswilliams.net> Nicholas Williams <nicholas@nicholaswilliams.net> 

-Original file line number
+Diff line change
@@ @@ -0,0 +1,13 @@ @@
 +Juergen Hoeller <[email protected]> jhoeller <[email protected]>
 +<[email protected]> <[email protected]>
 +<[email protected]> <[email protected]>
 +<[email protected]> <[email protected]>
 +<[email protected]> <[email protected]>
 +<[email protected]> <[email protected]>
 +<[email protected]> <[email protected]>
 +<[email protected]> <[email protected]>
 +<[email protected]> <[email protected]>
 +<[email protected]> <[email protected]>
 +<[email protected]> <[email protected]>
 +<[email protected]> <[email protected]>
 +Nick Williams <[email protected]> Nicholas Williams <[email protected]>