summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Philip Oakley <philipoakley@iee.email>2019-08-11 16:03:38 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-08-11 15:07:51 -0700
commit3d246dec119a55d0a2442cff9b05b6998531f199 (patch)
tree9a012e3ef8861c011c16c115a8f8c21a94679b8c
parentMerge branch 'cb/xdiff-no-system-includes-in-dot-c' into maint (diff)
downloadtgif-3d246dec119a55d0a2442cff9b05b6998531f199.tar.xz
.mailmap: update email address of Philip Oakley
My IEE 'home for life' email service is being withdrawn on 30 Sept 2019. Replace with my new email domain. I also have a secondary (backup) 'home for life' through <philipoakley@dunelm.org.uk>. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 82cd0569d5..9a5ff04753 100644
--- a/.mailmap
+++ b/.mailmap
@@ -210,6 +210,7 @@ Petr Baudis <pasky@ucw.cz> <pasky@suse.cz>
Petr Baudis <pasky@ucw.cz> <xpasky@machine>
Phil Hord <hordp@cisco.com> <phil.hord@gmail.com>
Philip Jägenstedt <philip@foolip.org> <philip.jagenstedt@gmail.com>
+Philip Oakley <philipoakley@iee.email> <philipoakley@iee.org> # secondary <philipoakley@dunelm.org.uk>
Philipp A. Hartmann <pah@qo.cx> <ph@sorgh.de>
Philippe Bruhat <book@cpan.org>
Ralf Thielow <ralf.thielow@gmail.com> <ralf.thielow@googlemail.com>