summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-08-10 12:33:18 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-08-10 12:33:18 -0700
commit2dceb92231e04af34d4020c9ff130c52ca0df705 (patch)
treef265a36bda720d7aa05e288b08de41e12d83c906
parentMerge branch 'jt/format-patch-from-config' (diff)
parent.mailmap: use Christian Couder's Tuxfamily address (diff)
downloadtgif-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 a714e69a11..9441a54b0d 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>