summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorErica Windisch <erica@windisch.us>2017-03-28 19:55:08 +0000
committerErica Windisch <erica@windisch.us>2017-03-28 19:55:08 +0000
commit88535f97330f278b1be2c736f74a88d6abc27ca6 (patch)
treec1044ad67bd59319870a36e5f9d1a7e5dc7bc583 /.mailmap
parent78e0ad79533d8a9d092071e24dfb41894ad17756 (diff)
downloaddocker-88535f97330f278b1be2c736f74a88d6abc27ca6.tar.gz
Update Erica in mailmap
Fix my name and email address. Signed-off-by: Erica Windisch <erica@windisch.us>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 014cc0e93e..350ecaf44a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -131,7 +131,8 @@ Francisco Carriedo <fcarriedo@gmail.com>
<baloo@gandi.net> <superbaloo+registrations.github@superbaloo.net>
Brian Goff <cpuguy83@gmail.com>
<cpuguy83@gmail.com> <bgoff@cpuguy83-mbp.home>
-<eric@windisch.us> <ewindisch@docker.com>
+Erica Windisch <erica@windisch.us> <ewindisch@docker.com>
+Erica Windisch <erica@windisch.us> <eric@windisch.us>
<frank.rosquin+github@gmail.com> <frank.rosquin@gmail.com>
Hollie Teal <hollie@docker.com>
<hollie@docker.com> <hollie.teal@docker.com>