]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8ed205a cdb6b5a)
Merge branch 'sb/mailmap-updates'
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Aug 2013 17:49:33 +0000 (10:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Aug 2013 17:49:33 +0000 (10:49 -0700)
* sb/mailmap-updates:
  .mailmap: Combine more (name, email) to individual persons
  .mailmap: update long-lost friends with multiple defunct addresses

1  2 
.mailmap patch | diff1 | diff2 | blob | history

diff --cc .mailmap
Simple merge
Unnamed repository; edit this file 'description' to name the repository.