Re: [PATCH v2] unpack-trees: fix oneway_merge accidentally carry over stage index

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, Mar 20, 2019 at 7:41 AM Junio C Hamano <gitster@xxxxxxxxx> wrote:
>
> Phillip Wood <phillip.wood123@xxxxxxxxx> writes:
>
> > Thanks for doing this, one minor comment - I try to use
> > phillip.wood@xxxxxxxxxxxxx for git as it wont change if I change my
> > email provider.
>
> You mean something like this?

I think he meant fixing the Reported-by: line. But since there's at
least another commit in 'next' with the 123@gmail address, it's
probably best to update .mailmap too (and maybe still fix the
Reported-by: in this patch).

>  .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@xxxxxxxxx> <phil.hord@xxxxxxxxx>
>  Philip Jägenstedt <philip@xxxxxxxxxx> <philip.jagenstedt@xxxxxxxxx>
>  Philipp A. Hartmann <pah@xxxxx> <ph@xxxxxxxx>
>  Philippe Bruhat <book@xxxxxxxx>
> +Phillip Wood <phillip.wood@xxxxxxxxxxxxx> <phillip.wood123@xxxxxxxxx>
>  Ralf Thielow <ralf.thielow@xxxxxxxxx> <ralf.thielow@xxxxxxxxxxxxxx>
>  Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxxx> <ramsay@xxxxxxxxxxxxxxxxxxx>
>  Randall S. Becker <randall.becker@xxxxxxxxxxxx> <rsbecker@xxxxxxxxxxxxx>



-- 
Duy




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux