summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-18 19:59:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-18 19:59:58 (GMT)
commitcbc7fdf81dee94333f11e775ab47b7e7b35ea81c (patch)
treed06d7511171e1753cc612885a187e0303cf78a4e /.mailmap
parentec1b80b9c49652d0f1ad4b5f4e1a2efc4ed20029 (diff)
parent76053e77efb3097cfb4cdaf2eb76ce4ee65ff58b (diff)
downloadgit-cbc7fdf81dee94333f11e775ab47b7e7b35ea81c.zip
git-cbc7fdf81dee94333f11e775ab47b7e7b35ea81c.tar.gz
git-cbc7fdf81dee94333f11e775ab47b7e7b35ea81c.tar.bz2
Merge branch 'rs/mailmap-himself'
* rs/mailmap-himself: .mailmap: René Scharfe has a new email address
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 1 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index df8898f..57070b5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -163,7 +163,7 @@ Philipp A. Hartmann <pah@qo.cx> <ph@sorgh.de>
Philippe Bruhat <book@cpan.org>
Ralf Thielow <ralf.thielow@gmail.com> <ralf.thielow@googlemail.com>
Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
-René Scharfe <rene.scharfe@lsrfire.ath.cx>
+René Scharfe <l.s.r@web.de> <rene.scharfe@lsrfire.ath.cx>
Robert Fitzsimons <robfitz@273k.net>
Robert Shearman <robertshearman@gmail.com> <rob@codeweavers.com>
Robert Zeh <robert.a.zeh@gmail.com>