From: Stefan Beller Date: Fri, 3 Jan 2014 19:33:21 +0000 (+0100) Subject: Update .mailmap file X-Git-Tag: v209~541 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=9dddaedfcc70c6dc37ba6a48d1d8e27e12c0cb2e Update .mailmap file This commit updates email addresses of people, who are already in the .mailmap file, so I'd assume they have sorted out their viewpoint on privacy within the .mailmap file. The entries for this commit have been produced using: # Finding out duplicates by comparing email addresses: git shortlog -sne |awk '{ print $NF }' |sort |uniq -d # Finding out duplicates by comparing names: git shortlog -sne |awk '{ NF--; $1=""; print }' |sort |uniq -d --- diff --git a/.mailmap b/.mailmap index ddaf4d570..e1cdf0616 100644 --- a/.mailmap +++ b/.mailmap @@ -3,6 +3,7 @@ Kay Sievers Kay Sievers Kay Sievers Kay Sievers +Kay Sievers Greg KH Greg KH Greg KH @@ -36,7 +37,7 @@ Michal Soltys Piter PUNK Richard Hughes Robby Workman -Shawn Landden +Shawn Landden Simon Peeters Tobias Klauser Miklos Vajna @@ -50,6 +51,7 @@ Ted Ts'o Tobias Klauser Tobias Klauser Tobias Klauser +Tobias Klauser Patrick Mansfield Christophe Varoqui Daniel Stekloff