summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-10-03 13:30:37 -0700
committerJunio C Hamano <gitster@pobox.com>2016-10-03 13:30:37 -0700
commit883ac0223739cdbb85f1176e49fc8aafd36dacca (patch)
tree406d5524807676a66a483ef8b77e6ae4edbab325
parentcb3debdc122314401a7107fa6e2d18fea2b7f268 (diff)
parent8201688ecdaee73912ee43fda89bc0374080887b (diff)
downloadgit-883ac0223739cdbb85f1176e49fc8aafd36dacca.tar.gz
Merge branch 'dt/mailinfo'
* 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>