diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-18 12:59:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-18 12:59:58 -0700 |
| commit | cbc7fdf81dee94333f11e775ab47b7e7b35ea81c (patch) | |
| tree | d06d7511171e1753cc612885a187e0303cf78a4e /.mailmap | |
| parent | ec1b80b9c49652d0f1ad4b5f4e1a2efc4ed20029 (diff) | |
| parent | 76053e77efb3097cfb4cdaf2eb76ce4ee65ff58b (diff) | |
| download | git-cbc7fdf81dee94333f11e775ab47b7e7b35ea81c.tar.gz git-cbc7fdf81dee94333f11e775ab47b7e7b35ea81c.tar.xz | |
Merge branch 'rs/mailmap-himself'
* rs/mailmap-himself:
.mailmap: René Scharfe has a new email address
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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> |