delta/git.git/.mailmap, branch ta/tutorial-modernize

.mailmap: add Stefan Bellers corporate mail address

2014-10-21T18:01:27+00:00

Note that despite the private address being first and primary,
Google owns the copyright on this patch as any other patch I'll be
sending signed off by the sbeller@google.com address.

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

Sync with v2.0.3

2014-07-23T18:36:40+00:00

* maint:
  Git 2.0.3
  .mailmap: combine Stefan Beller's emails
  git.1: switch homepage for stats

.mailmap: combine Stefan Beller's emails

2014-07-23T18:27:05+00:00

Google mail has had the extension @googlemail.com for a long time
in Germany as @gmail.de was already taken by a competitor.
Nowadays the original gmail company isn't there anymore(?), hence
Googlemail also introduced @gmail.com in Germany, which I switched to.

This changed mail address of mine first appeared in 398dd4bd039680b
(2014-07-10, .mailmap: map different names with the same email
address together) ironically.

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

.mailmap: map different names with the same email address together

2014-07-17T17:48:09+00:00

Pretty much one year ago (94b410bba864, Jul 12 2013, .mailmap: Map
email addresses to names) I cleaned up the output of `git shortlog
-sne` of git.git by writing a .mailmap file fot the git.git project.

During the year Jens, Kazuki and Trần contributed to git.git using
different names, but the same email address; unify them.

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

.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