summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-10-11 14:17:52 -0700
committerJunio C Hamano <gitster@pobox.com>2016-10-11 14:17:52 -0700
commitf7e2e592cf9bad03bc3adc44dcbe498b876dc808 (patch)
tree2d214c00d4a5ba5bc075f39ed0998fc9abff7a4e
parent6406bdc0b95715a087fdeeb0f6adf3deb80a25b8 (diff)
parent8201688ecdaee73912ee43fda89bc0374080887b (diff)
downloadgit-f7e2e592cf9bad03bc3adc44dcbe498b876dc808.tar.gz
Merge branch 'dt/mailinfo' into maint
* dt/mailinfo: add David Turner's Two Sigma address
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 9441a54b0d..9cc33e925d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -48,6 +48,7 @@ David Kågedal <davidk@lysator.liu.se>
David Reiss <dreiss@facebook.com> <dreiss@dreiss-vmware.(none)>
David S. Miller <davem@davemloft.net>
David Turner <novalis@novalis.org> <dturner@twopensource.com>
+David Turner <novalis@novalis.org> <dturner@twosigma.com>
Deskin Miller <deskinm@umich.edu>
Dirk Süsserott <newsletter@dirk.my1.cc>
Eric Blake <eblake@redhat.com> <ebb9@byu.net>