delta/git.git/.mailmap, branch ss/userdiff-update-csharp-java

.mailmap: switch to Thomas Rast's personal address

2013-10-13T21:28:27+00:00

Normalize to my personal address, as my ETH addresses will expire
soon.  Also add my new corp account to be somewhat futureproof.

Note that despite the private address being first, Google owns the
copyright as long as I am employed there.

Signed-off-by: Thomas Rast 
Signed-off-by: Jonathan Nieder

Merge branch 'sb/mailmap-updates'

2013-08-13T17:49:33+00:00

* sb/mailmap-updates:
  .mailmap: Combine more (name, email) to individual persons
  .mailmap: update long-lost friends with multiple defunct addresses

.mailmap: Combine more (name, email) to individual persons

2013-08-13T17:49:06+00:00

Signed-off-by: Stefan Beller 
Signed-off-by: Junio C Hamano

.mailmap: update long-lost friends with multiple defunct addresses

2013-08-13T17:47:44+00:00

A handful of past contributors are recorded with multiple e-mail
addresses, all of which are undeliverable.  With a lot of help from
Jonathan, we located all of them except for one person, and a pair
of addresses we suspect belong to a single person but we are not
certain.

Update the found ones with their currently preferred address, and
use the last known address to consolidate contributions by the lost
one.

Helped-by: Stefan Beller 
Helped-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano

Merge branch 'sb/mailmap-updates'

2013-08-09T21:30:13+00:00

* sb/mailmap-updates:
  .mailmap: fixup entries

.mailmap: fixup entries

2013-08-09T21:20:38+00:00

This patch adds no new names, but fixes the mistakes I made in the previous
commits. (94b410bba8, f4f49e225, c07a6bc57, 2013-07-12, .mailmap: Map
email addresses to names).

These mistakes are double white spaces between name and surname,
different capitalization in email address, or just the email address set
as name.

Also I forgot to include James Knight to the mailmap file.

Signed-off-by: Stefan Beller 
Signed-off-by: Junio C Hamano

Merge branch 'sb/mailmap-updates'

2013-08-05T17:11:14+00:00

* sb/mailmap-updates:
  .mailmap: Multiple addresses of Michael S. Tsirkin

.mailmap: Multiple addresses of Michael S. Tsirkin

2013-08-05T15:27:42+00:00

Acked-by: Michael S. Tsirkin 
Signed-off-by: Stefan Beller 
Signed-off-by: Junio C Hamano

Merge branch 'sb/mailmap-updates'

2013-07-30T16:16:40+00:00

* sb/mailmap-updates:
  .mailmap: combine more (email, name) to individual persons

.mailmap: combine more (email, name) to individual persons

2013-07-24T23:04:37+00:00

I got more responses from people regarding the .mailmap file.
All added persons gave permission to add them to the .mailmap file.

Signed-off-by: Stefan Beller 
Signed-off-by: Junio C Hamano