From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 12 Jul 2013 16:27:01 GMT
Subject: Re: [PATCH v2] Corrections to the mailmap file
Message-ID: <7v7ggvoiay.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1373629769-23647-1-git-send-email-stefanbeller@googlemail.com>

Stefan Beller <stefanbeller@googlemail.com> writes:

> By now I contacted more than half the people, who might
> get some .mailmap entries. Not all of them have responded,
> but maybe 2/3 of those, whom I contacted.
>
> I used 2 branches to get this work done. One branch having
> all the proposed patches, where each patch just changes one
> name, so I can send it to that specific person for review.
> The second branch would be slightly behind the first branch
> and only have the patches of the confirmed .mailmap changes.
> The following patch is a squashed version of the confirmed 
> branch.
>
> Whenever somebody confirmed their patch, I'd include it
> into the confirmed branch and rebase the first branch on top
> of it. That works fine, if there are no many commits
> in between, so no merge conflicts occur.
>
> Junio, therefore I'd ask to include the following patch as 
> the 1/3 milestone in the mailmap completion, so the number of
> my local patches floating around is reduced.
>
> The 6 patches sent at 4th July are not required anymore,
> but the following patch directly applies to your master branch.
>
> Stefan Beller (1):
>   .mailmap: Map email addresses to names
>
>  .mailmap | 95 ++++++++++++++++++++++++++++++++++++++++++++++++----------------
>  1 file changed, 71 insertions(+), 24 deletions(-)

Thanks.