[RFH] .mailmap late summer cleaning

We have the "mailmap" mechanism to unify entries for a person with multiple e-mail addresses into one "Name <address>", but it seems that the .mailmap file hasn't been keeping up to the changes in the real world.

Does any of you contributors who has commits in my tree want to update how you appear in "shortlog -e -s -n" output? It may show your ancient e-mail address, for example. If so, here is what I want you to do.

First, run "git shortlog -e -s origin/pu" in a clone of git.git source tree and find your name. If you do not find your name listed multiple times, or if you do not want them to be unified to your latest address, stop here. There is nothing you need to do.

Otherwise, please tell me which "Name <addr>" you do not want to see. For example, Martin vonZ recently changed his e-mail address, and he appears twice in the "shortlog -e -s" output, like so:

  70  Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
   3  Martin von Zweigbergk <martinvonz@gmail.com>

Suppose that he wants to use the latter from now on (in other words, he does not want to see the longer one). I want to be told his wish with the following (all on a single line, without leading indent):

    Martin von Zweigbergk <martinvonz@gmail.com> <martin.von.zweigbergk@gmail.com>

The format is "Name <preferred-address> <address-you-do-not-want-to-see>".

Even though he doesn't, if he also had appeared in "shortlog -e -s" output like this:

   1  Martin von Zweigbergk <y@google.com>

that could also be mapped to his new address, with another line:

    Martin von Zweigbergk <martinvonz@gmail.com> <y@google.com>

I'll collect responses to this message, and update the file sometime late next week.

Thanks.