All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stefan Beller <stefanbeller@googlemail.com>
To: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Cc: Stefan Beller <stefanbeller@googlemail.com>
Subject: [PATCH v2] Corrections to the mailmap file
Date: Fri, 12 Jul 2013 13:49:28 +0200	[thread overview]
Message-ID: <1373629769-23647-1-git-send-email-stefanbeller@googlemail.com> (raw)
In-Reply-To: <7vzjttq9wk.fsf@alter.siamese.dyndns.org>

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(-)

-- 
1.8.3.2.636.g7943f03

  parent reply	other threads:[~2013-07-12 11:49 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-04 14:04 [PATCH 0/6] Corrections to the mailmap file Stefan Beller
2013-07-04 14:04 ` [PATCH 1/6] .mailmap: Multiple email addresses of Alejandro R. Sedeño Stefan Beller
2013-07-04 14:04 ` [PATCH 2/6] .mailmap: Multiple mail addresses of Alex Riesen Stefan Beller
2013-07-04 14:04 ` [PATCH 3/6] .mailmap: Multiple mail addresses of Paul Mackerras Stefan Beller
2013-07-04 14:04 ` [PATCH 4/6] .mailmap: Multiple mail addresses of Keith Cascio Stefan Beller
2013-07-04 14:04 ` [PATCH 5/6] .mailmap: Multiple mail addresses of Johannes Schindelin Stefan Beller
2013-07-04 14:04 ` [PATCH 6/6] .mailmap: Multiple mail addresses of Toby Allsopp Stefan Beller
2013-07-04 14:37 ` [PATCH 0/6] Corrections to the mailmap file Stefan Beller
2013-07-11 17:33 ` Junio C Hamano
2013-07-11 17:52   ` Stefan Beller
2013-07-11 18:16     ` Junio C Hamano
2013-07-12 11:49   ` Stefan Beller [this message]
2013-07-12 11:49     ` [PATCH] .mailmap: Map email addresses to names Stefan Beller
2013-07-12 16:31       ` Junio C Hamano
2013-07-12 18:57       ` Jonathan Nieder
2013-07-12 19:02         ` Stefan Beller
2013-07-12 19:10           ` Stefan Beller
2013-07-12 16:27     ` [PATCH v2] Corrections to the mailmap file Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1373629769-23647-1-git-send-email-stefanbeller@googlemail.com \
    --to=stefanbeller@googlemail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.