From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 20 Mar 2019 00:41:17 GMT
Subject: Re: [PATCH v2] unpack-trees: fix oneway_merge accidentally carry over stage index
Message-ID: <xmqq5zsextqq.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <228d681e-4cfd-7e2e-8bb9-1624cc244a9f@gmail.com>

Phillip Wood <phillip.wood123@gmail.com> writes:

> Thanks for doing this, one minor comment - I try to use
> phillip.wood@dunelm.org.uk for git as it wont change if I change my
> email provider.

You mean something like this?

 .mailmap | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.mailmap b/.mailmap
index 82cd0569d5..6e137576ec 100644
--- a/.mailmap
+++ b/.mailmap
@@ -212,6 +212,7 @@ Phil Hord <hordp@cisco.com> <phil.hord@gmail.com>
 Philip Jägenstedt <philip@foolip.org> <philip.jagenstedt@gmail.com>
 Philipp A. Hartmann <pah@qo.cx> <ph@sorgh.de>
 Philippe Bruhat <book@cpan.org>
+Phillip Wood <phillip.wood@dunelm.org.uk> <phillip.wood123@gmail.com>
 Ralf Thielow <ralf.thielow@gmail.com> <ralf.thielow@googlemail.com>
 Ramsay Jones <ramsay@ramsayjones.plus.com> <ramsay@ramsay1.demon.co.uk>
 Randall S. Becker <randall.becker@nexbridge.ca> <rsbecker@nexbridge.com>