Merge pull request #533 from jsquyres/pr/v2.x-add-mailmap

hppritcha · hppritcha · commit 0fd1475d0bed · 2015-08-21T10:15:10.000-06:00
mailmap: add entries to the git mailmap
diff --git a/.mailmap b/.mailmap
@@ -21,6 +21,8 @@
 
 Dave Goodell <dgoodell@cisco.com> <dgoodell@open-mpi-git-mirror.example.com>
 Jeff Squyres <jsquyres@cisco.com> <jsquyres@open-mpi-git-mirror.example.com>
+# Jeff accidentally stomped on his $HOME/.gitconfig for a short while:
+Jeff Squyres <jsquyres@cisco.com> --quiet <--quiet>
 Reese Faucette <rfaucett@cisco.com> <rfaucett@open-mpi-git-mirror.example.com>
 Bill D'Amico <bdamico@cisco.com> <damico@open-mpi-git-mirror.example.com>
 Adrian Reber <adrian.reber@hs-esslingen.de> <adrian@open-mpi-git-mirror.example.com>

-Original file line number
+Diff line change
 Dave Goodell <[email protected]> <[email protected]>
 Jeff Squyres <[email protected]> <[email protected]>
 +# Jeff accidentally stomped on his $HOME/.gitconfig for a short while:
 +Jeff Squyres <[email protected]> --quiet <--quiet>
 Reese Faucette <[email protected]> <[email protected]>
 Bill D'Amico <[email protected]> <[email protected]>
 Adrian Reber <[email protected]> <[email protected]>