aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-10 12:33:18 -0700
committerJunio C Hamano <gitster@pobox.com>2016-08-10 12:33:18 -0700
commit2dceb92231e04af34d4020c9ff130c52ca0df705 (patch)
treef265a36bda720d7aa05e288b08de41e12d83c906
parentdb40a622395397c84c247d343ef62acc8775d6b2 (diff)
parentb3cbdd41cd5fbf9a33027f9dfe199fc77158dc93 (diff)
downloadgit-2dceb92231e04af34d4020c9ff130c52ca0df705.tar.gz
git-2dceb92231e04af34d4020c9ff130c52ca0df705.tar.xz
Merge branch 'cc/mailmap-tuxfamily'
* cc/mailmap-tuxfamily: .mailmap: use Christian Couder's Tuxfamily address
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index a714e69a1..9441a54b0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -33,6 +33,7 @@ Cheng Renquan <crquan@gmail.com>
Chris Shoemaker <c.shoemaker@cox.net>
Chris Wright <chrisw@sous-sol.org> <chrisw@osdl.org>
Cord Seele <cowose@gmail.com> <cowose@googlemail.com>
+Christian Couder <chriscool@tuxfamily.org> <christian.couder@gmail.com>
Christian Stimming <stimming@tuhh.de> <chs@ckiste.goetheallee>
Csaba Henk <csaba@gluster.com> <csaba@lowlife.hu>
Dan Johnson <computerdruid@gmail.com>