summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-09-21 12:58:35 -0700
committerJunio C Hamano <gitster@pobox.com>2015-09-21 12:58:35 -0700
commit74a844a5555bccec037545d99dd9ba95f5835638 (patch)
tree91509d9c378dc9b031e3f2ffc110f94fb14c2ea2
parentb6bd2d09646fbacd3fd9d859fd219707812baae4 (diff)
parentdafc0473698d95ec89b006520a0f51145fd02597 (diff)
downloadgit-74a844a5555bccec037545d99dd9ba95f5835638.tar.gz
Merge branch 'rj/mailmap-ramsay'
* rj/mailmap-ramsay: mailmap: update my entry with new email address
-rw-r--r--.mailmap2
1 files changed, 1 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index ece2951a2b..e5b4126bec 100644
--- a/.mailmap
+++ b/.mailmap
@@ -186,7 +186,7 @@ Philip Jägenstedt <philip@foolip.org> <philip.jagenstedt@gmail.com>
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>
+Ramsay Jones <ramsay@ramsayjones.plus.com> <ramsay@ramsay1.demon.co.uk>
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>