aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2012-12-12 06:36:35 -0500
committerJunio C Hamano <gitster@pobox.com>2012-12-12 11:09:11 -0800
commit055e57876698f44e917152187e7850d8f7e7e0b5 (patch)
tree1d98c05f2e29f2da1abc3d20aa0de20a66373e64 /contrib
parent50b03b04c06f44be0d09bcc2b56723e8de985d9a (diff)
downloadgit-055e57876698f44e917152187e7850d8f7e7e0b5.tar.gz
git-055e57876698f44e917152187e7850d8f7e7e0b5.tar.xz
.mailmap: match up some obvious names/emails
This patch updates git's .mailmap in cases where multiple names are matched to a single email. The "master" name for each email was chosen by: 1. If the only difference is in the presence or absence of accented characters, the accented form is chosen (under the assumption that it is the natural spelling, and accents are sometimes stripped in email). 2. Otherwise, the most commonly used name is chosen. 3. If all names are equally common, the most recently used name is chosen. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions