[PATCH] .mailmap: Map email addresses to names

2013-07-12 Thread Stefan Beller
People change email addresses quite often and sometimes
forget to add their entry to the mailmap file.
I have contacted lots of people, whose name occurs
multiple times in the short log having different
email addresses. The entries in the mailmap of
this patch are either confirmed by them or are trivial.
Trivial means different capitalisation of the domain
(@MIT.EDU and @mit.edu) or the domain was localhost,
(none) or @local.

Additionally to adding (name, email) mappings to the
.mailmap file, it has also been sorted alphabetically.
(which explains the removals, which are added
3 lines later on again)

While the most changes happen at the email addresses,
we also have a name change in here. Karl Hasselström
is now known as Karl Wiberg due to marriage. Congratulations!

To find out whom to contact I used the following small
script:
---
#!/bin/bash
git shortlog -sne |awk '{ NF--; $1=; print }' |sort |uniq -d  
mailmapdoubles
while read line ; do
# remove leading whitespace
trimmed=$(echo $line | sed -e 's/^ *//g' -e 's/ *$//g')
echo git shortlog -sne | grep \$trimmed\
done  mailmapdoubles  mailmapdoubles2
sh mailmapdoubles2
rm mailmapdoubles
rm mailmapdoubles2
---
Also interesting for similar tasks are these snippets:

# 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
---

Signed-off-by: Stefan Beller stefanbel...@googlemail.com
---
 .mailmap | 95 
 1 file changed, 71 insertions(+), 24 deletions(-)

diff --git a/.mailmap b/.mailmap
index 345cce6..1179767 100644
--- a/.mailmap
+++ b/.mailmap
@@ -5,99 +5,146 @@
 # same person appearing not to be so.
 #
 
-Alex Bennée kernel-hac...@bennee.com
+Alejandro R. Sedeño ased...@mit.edu ased...@mit.edu
 Alexander Gavrilov angavri...@gmail.com
+Alex Bennée kernel-hac...@bennee.com
+Alex Riesen raa.l...@gmail.com fo...@t-online.de
+Alex Riesen raa.l...@gmail.com raa@limbo.localdomain
+Alex Riesen raa.l...@gmail.com r...@steel.home
+Anders Kaseorg ande...@mit.edu ande...@ksplice.com
+Anders Kaseorg ande...@mit.edu ande...@mit.edu
 Aneesh Kumar K.V aneesh.ku...@gmail.com
+anonymous li...@horizon.com
+anonymous li...@horizon.net
+Brandon Casey draf...@gmail.com ca...@nrlssc.navy.mil
 Brian M. Carlson sand...@crustytoothpaste.ath.cx
 Cheng Renquan crq...@gmail.com
 Chris Shoemaker c.shoema...@cox.net
-Dan Johnson computerdr...@gmail.com
 Dana L. How dana...@gmail.com
 Dana L. How h...@deathvalley.cswitch.com
 Daniel Barkalow barka...@iabervon.org
+Dan Johnson computerdr...@gmail.com
 David D. Kilzer ddkil...@kilzer.net
 David Kågedal dav...@lysator.liu.se
+David Reiss dre...@facebook.com dreiss@dreiss-vmware.(none)
 David S. Miller da...@davemloft.net
 Deskin Miller desk...@umich.edu
 Dirk Süsserott newslet...@dirk.my1.cc
 Eric S. Raymond e...@thyrsus.com
 Erik Faye-Lund kusmab...@gmail.com kusmab...@googlemail.com
-Fredrik Kuivinen freku...@student.liu.se
+Florian Achleitner florian.achleitner.2.6...@gmail.com 
florian.achleitner2.6...@gmail.com
+Franck Bui-Huu vagabon@gmail.com fbui...@gmail.com
+Frank Lichtenheld fr...@lichtenheld.de dj...@debian.org
+Frank Lichtenheld fr...@lichtenheld.de flichtenh...@astaro.com
 Frédéric Heitzmann frederic.heitzm...@gmail.com
+Fredrik Kuivinen freku...@student.liu.se
+Han-Wen Nienhuys han...@google.com Han-Wen Nienhuys han...@xs4all.nl
 H. Merijn Brand h.m.br...@xs4all.nl H.Merijn Brand h.m.br...@xs4all.nl
-H. Peter Anvin h...@bonde.sc.orionmulti.com
-H. Peter Anvin h...@tazenda.sc.orionmulti.com
-H. Peter Anvin h...@trantor.hos.anvin.org
 Horst H. von Brand vonbr...@inf.utfsm.cl
+H. Peter Anvin h...@zytor.com h...@bonde.sc.orionmulti.com
+H. Peter Anvin h...@zytor.com h...@smyrno.hos.anvin.org
+H. Peter Anvin h...@zytor.com h...@tazenda.sc.orionmulti.com
+H. Peter Anvin h...@zytor.com h...@trantor.hos.anvin.org
 İsmail Dönmez ism...@pardus.org.tr
 Jakub Narębski jna...@gmail.com
-Jay Soffian jaysoffian+...@gmail.com
+Jay Soffian jaysoff...@gmail.com jaysoffian+...@gmail.com
+J. Bruce Fields bfie...@citi.umich.edu bfie...@fieldses.org
+J. Bruce Fields bfie...@citi.umich.edu bfie...@pig.linuxdev.us.dell.com
+J. Bruce Fields bfie...@citi.umich.edu bfie...@puzzle.fieldses.org
 Jeff King p...@peff.net p...@github.com
 Joachim Berdal Haga cjh...@fys.uio.no
+Johannes Schindelin johannes.schinde...@gmx.de johannes.schinde...@gmx.de
 Johannes Sixt j...@kdbg.org johannes.s...@telecom.at
-Johannes Sixt j...@kdbg.org j.s...@viscovery.net
 Johannes Sixt j...@kdbg.org j.s...@eudaptics.com
+Johannes Sixt j...@kdbg.org j.s...@viscovery.net
+Jonathan Nieder jrnie...@gmail.com jrnie...@uchicago.edu
 Jon Loeliger j...@freescale.com
 Jon Seymour j...@blackcubes.dyndns.org
-Jonathan Nieder jrnie...@uchicago.edu
 Junio C Hamano gits...@pobox.com 

Re: [PATCH] .mailmap: Map email addresses to names

2013-07-12 Thread Junio C Hamano
Stefan Beller stefanbel...@googlemail.com writes:

 People change email addresses quite often and sometimes
 forget to add their entry to the mailmap file.
 I have contacted lots of people, whose name occurs
 multiple times in the short log having different
 email addresses. The entries in the mailmap of
 this patch are either confirmed by them or are trivial.
 Trivial means different capitalisation of the domain
 (@MIT.EDU and @mit.edu) or the domain was localhost,
 (none) or @local.

 Additionally to adding (name, email) mappings to the
 .mailmap file, it has also been sorted alphabetically.
 (which explains the removals, which are added
 3 lines later on again)

 While the most changes happen at the email addresses,
 we also have a name change in here. Karl Hasselström
 is now known as Karl Wiberg due to marriage. Congratulations!

 To find out whom to contact I used the following small
 script:
 ---
 #!/bin/bash
 git shortlog -sne |awk '{ NF--; $1=; print }' |sort |uniq -d  
 mailmapdoubles
 while read line ; do
 # remove leading whitespace
 trimmed=$(echo $line | sed -e 's/^ *//g' -e 's/ *$//g')
 echo git shortlog -sne | grep \$trimmed\
 done  mailmapdoubles  mailmapdoubles2
 sh mailmapdoubles2
 rm mailmapdoubles
 rm mailmapdoubles2
 ---
 Also interesting for similar tasks are these snippets:

 # 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
 ---

 Signed-off-by: Stefan Beller stefanbel...@googlemail.com
 ---

Thanks, but please be careful about these three-dashes when sending
the next batch.  As you may have already guessed, Git cannot guess
reliably which one of the abouve four three-dash lines is the end of
the proposed log message, and cuts at the first one.

  .mailmap | 95 
 
  1 file changed, 71 insertions(+), 24 deletions(-)

 diff --git a/.mailmap b/.mailmap
 index 345cce6..1179767 100644
 --- a/.mailmap
 +++ b/.mailmap
 @@ -5,99 +5,146 @@
  # same person appearing not to be so.
  #
  
 -Alex Bennée kernel-hac...@bennee.com
 +Alejandro R. Sedeño ased...@mit.edu ased...@mit.edu
  Alexander Gavrilov angavri...@gmail.com
 +Alex Bennée kernel-hac...@bennee.com
 +Alex Riesen raa.l...@gmail.com fo...@t-online.de
 +Alex Riesen raa.l...@gmail.com raa@limbo.localdomain
 +Alex Riesen raa.l...@gmail.com r...@steel.home
 +Anders Kaseorg ande...@mit.edu ande...@ksplice.com
 +Anders Kaseorg ande...@mit.edu ande...@mit.edu
  Aneesh Kumar K.V aneesh.ku...@gmail.com
 +anonymous li...@horizon.com
 +anonymous li...@horizon.net
 +Brandon Casey draf...@gmail.com ca...@nrlssc.navy.mil
  Brian M. Carlson sand...@crustytoothpaste.ath.cx
  Cheng Renquan crq...@gmail.com
  Chris Shoemaker c.shoema...@cox.net
 -Dan Johnson computerdr...@gmail.com
  Dana L. How dana...@gmail.com
  Dana L. How h...@deathvalley.cswitch.com
  Daniel Barkalow barka...@iabervon.org
 +Dan Johnson computerdr...@gmail.com
  David D. Kilzer ddkil...@kilzer.net
  David Kågedal dav...@lysator.liu.se
 +David Reiss dre...@facebook.com dreiss@dreiss-vmware.(none)
  David S. Miller da...@davemloft.net
  Deskin Miller desk...@umich.edu
  Dirk Süsserott newslet...@dirk.my1.cc
  Eric S. Raymond e...@thyrsus.com
  Erik Faye-Lund kusmab...@gmail.com kusmab...@googlemail.com
 -Fredrik Kuivinen freku...@student.liu.se
 +Florian Achleitner florian.achleitner.2.6...@gmail.com 
 florian.achleitner2.6...@gmail.com
 +Franck Bui-Huu vagabon@gmail.com fbui...@gmail.com
 +Frank Lichtenheld fr...@lichtenheld.de dj...@debian.org
 +Frank Lichtenheld fr...@lichtenheld.de flichtenh...@astaro.com
  Frédéric Heitzmann frederic.heitzm...@gmail.com
 +Fredrik Kuivinen freku...@student.liu.se
 +Han-Wen Nienhuys han...@google.com Han-Wen Nienhuys han...@xs4all.nl
  H. Merijn Brand h.m.br...@xs4all.nl H.Merijn Brand h.m.br...@xs4all.nl
 -H. Peter Anvin h...@bonde.sc.orionmulti.com
 -H. Peter Anvin h...@tazenda.sc.orionmulti.com
 -H. Peter Anvin h...@trantor.hos.anvin.org
  Horst H. von Brand vonbr...@inf.utfsm.cl
 +H. Peter Anvin h...@zytor.com h...@bonde.sc.orionmulti.com
 +H. Peter Anvin h...@zytor.com h...@smyrno.hos.anvin.org
 +H. Peter Anvin h...@zytor.com h...@tazenda.sc.orionmulti.com
 +H. Peter Anvin h...@zytor.com h...@trantor.hos.anvin.org
  İsmail Dönmez ism...@pardus.org.tr
  Jakub Narębski jna...@gmail.com
 -Jay Soffian jaysoffian+...@gmail.com
 +Jay Soffian jaysoff...@gmail.com jaysoffian+...@gmail.com
 +J. Bruce Fields bfie...@citi.umich.edu bfie...@fieldses.org
 +J. Bruce Fields bfie...@citi.umich.edu bfie...@pig.linuxdev.us.dell.com
 +J. Bruce Fields bfie...@citi.umich.edu bfie...@puzzle.fieldses.org
  Jeff King p...@peff.net p...@github.com
  Joachim Berdal Haga cjh...@fys.uio.no
 +Johannes Schindelin johannes.schinde...@gmx.de johannes.schinde...@gmx.de
  

[PATCH] .mailmap: Map email addresses to names

2013-07-12 Thread Stefan Beller
The same kind of cleanup as sent earlier today
(2e2ae79df4fabea0157c5eb527b5396eb89185a1 locally here)

I asked all the people before, whether
they like their lines added. Many had
requests to change the order of the mail address.

When having this patch applied, you'll notice the
bug as described here
http://marc.info/?l=gitm=137364524514927w=2
http://www.mail-archive.com/git@vger.kernel.org/msg31964.html
(Bug in .mailmap handling?, for example look for Knut Franke)

Signed-off-by: Stefan Beller stefanbel...@googlemail.com
---
 .mailmap | 28 ++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 1179767..1d6ba17 100644
--- a/.mailmap
+++ b/.mailmap
@@ -7,6 +7,7 @@
 
 Alejandro R. Sedeño ased...@mit.edu ased...@mit.edu
 Alexander Gavrilov angavri...@gmail.com
+Alexey Shumkin alex.crez...@gmail.com zap...@mail.ru
 Alex Bennée kernel-hac...@bennee.com
 Alex Riesen raa.l...@gmail.com fo...@t-online.de
 Alex Riesen raa.l...@gmail.com raa@limbo.localdomain
@@ -18,12 +19,15 @@ anonymous li...@horizon.com
 anonymous li...@horizon.net
 Brandon Casey draf...@gmail.com ca...@nrlssc.navy.mil
 Brian M. Carlson sand...@crustytoothpaste.ath.cx
+Bryan Larsen br...@larsen.st bryan.lar...@gmail.com
+Bryan Larsen br...@larsen.st bryanlar...@yahoo.com
 Cheng Renquan crq...@gmail.com
 Chris Shoemaker c.shoema...@cox.net
 Dana L. How dana...@gmail.com
 Dana L. How h...@deathvalley.cswitch.com
 Daniel Barkalow barka...@iabervon.org
 Dan Johnson computerdr...@gmail.com
+David Brown g...@davidb.org dav...@quicinc.com
 David D. Kilzer ddkil...@kilzer.net
 David Kågedal dav...@lysator.liu.se
 David Reiss dre...@facebook.com dreiss@dreiss-vmware.(none)
@@ -31,7 +35,10 @@ David S. Miller da...@davemloft.net
 Deskin Miller desk...@umich.edu
 Dirk Süsserott newslet...@dirk.my1.cc
 Eric S. Raymond e...@thyrsus.com
+Eric Blake ebl...@redhat.com e...@byu.net
+Eric Hanchrow eric.hanch...@gmail.com off...@blarg.net
 Erik Faye-Lund kusmab...@gmail.com kusmab...@googlemail.com
+Eyvind Bernhardsen eyvind.bernhard...@gmail.com eyvind-...@orakel.ntnu.no
 Florian Achleitner florian.achleitner.2.6...@gmail.com 
florian.achleitner2.6...@gmail.com
 Franck Bui-Huu vagabon@gmail.com fbui...@gmail.com
 Frank Lichtenheld fr...@lichtenheld.de dj...@debian.org
@@ -47,19 +54,25 @@ H. Peter Anvin h...@zytor.com 
h...@tazenda.sc.orionmulti.com
 H. Peter Anvin h...@zytor.com h...@trantor.hos.anvin.org
 İsmail Dönmez ism...@pardus.org.tr
 Jakub Narębski jna...@gmail.com
+Jason Riedy e...@eecs.berkeley.edu e...@cs.berkeley.edu
+Jason Riedy e...@eecs.berkeley.edu e...@eecs.berkeley.edu
 Jay Soffian jaysoff...@gmail.com jaysoffian+...@gmail.com
 J. Bruce Fields bfie...@citi.umich.edu bfie...@fieldses.org
 J. Bruce Fields bfie...@citi.umich.edu bfie...@pig.linuxdev.us.dell.com
 J. Bruce Fields bfie...@citi.umich.edu bfie...@puzzle.fieldses.org
 Jeff King p...@peff.net p...@github.com
+Jeff Muizelaar jmuizel...@mozilla.com j...@infidigm.net
 Joachim Berdal Haga cjh...@fys.uio.no
 Johannes Schindelin johannes.schinde...@gmx.de johannes.schinde...@gmx.de
 Johannes Sixt j...@kdbg.org johannes.s...@telecom.at
 Johannes Sixt j...@kdbg.org j.s...@eudaptics.com
 Johannes Sixt j...@kdbg.org j.s...@viscovery.net
+Jonathan del Strother jon.delstrot...@bestbefore.tv maill...@steelskies.com
 Jonathan Nieder jrnie...@gmail.com jrnie...@uchicago.edu
 Jon Loeliger j...@freescale.com
-Jon Seymour j...@blackcubes.dyndns.org
+Jon Seymour jon.seym...@gmail.com j...@blackcubes.dyndns.org
+Josh Triplett j...@joshtriplett.org j...@freedesktop.org
+Josh Triplett j...@joshtriplett.org jo...@us.ibm.com
 Junio C Hamano gits...@pobox.com gits...@pobox.com
 Junio C Hamano gits...@pobox.com ju...@hera.kernel.org
 Junio C Hamano gits...@pobox.com ju...@kernel.org
@@ -71,11 +84,14 @@ Karl Wiberg k...@treskal.com Karl Hasselström 
k...@treskal.com
 Karl Wiberg k...@treskal.com Karl Hasselström 
k...@yoghurt.hemma.treskal.com
 Kay Sievers kay.siev...@vrfy.org kay@mam.(none)
 Kay Sievers kay.siev...@vrfy.org kay.siev...@suse.de
+Karsten Blees bl...@dcon.de karsten.bl...@dcon.de
+Karsten Blees bl...@dcon.de karsten.bl...@gmail.com
 Keith Cascio ke...@cs.ucla.edu ke...@cs.ucla.edu
 Kent Engstrom k...@lysator.liu.se
 Kevin Leung kevin...@gmail.com
 Kirill Smelkov k...@navytux.spb.ru k...@landau.phys.spbu.ru
 Kirill Smelkov k...@navytux.spb.ru k...@mns.spb.ru
+Knut Franke knut.fra...@gmx.de k.fra...@science-computing.de
 Lars Doelle lars.doelle@on-line ! de
 Lars Doelle lars.doe...@on-line.de
 Li Hong leeh...@pku.edu.cn
@@ -85,11 +101,14 @@ Linus Torvalds torva...@linux-foundation.org 
torva...@osdl.org
 Linus Torvalds torva...@linux-foundation.org torva...@ppc970.osdl.org
 Linus Torvalds torva...@linux-foundation.org 
torva...@ppc970.osdl.org.(none)
 Linus Torvalds torva...@linux-foundation.org 
torva...@woody.linux-foundation.org
-Lukas Sandström luk...@etek.chalmers.se
+Lukas Sandström luk...@gmail.com luk...@etek.chalmers.se
+Matt 

Re: [PATCH] .mailmap: Map email addresses to names

2013-07-12 Thread Jonathan Nieder
Stefan Beller wrote:

 --- a/.mailmap
 +++ b/.mailmap
 @@ -5,99 +5,146 @@
[...]
  Chris Shoemaker c.shoema...@cox.net
 -Dan Johnson computerdr...@gmail.com
  Dana L. How dana...@gmail.com
  Dana L. How h...@deathvalley.cswitch.com
  Daniel Barkalow barka...@iabervon.org
 +Dan Johnson computerdr...@gmail.com

Small nit: the sorting looks broken here and in similar places below
(the usual ordering is Dan  Dana  Daniel).

Thanks,
Jonathan
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH] .mailmap: Map email addresses to names

2013-07-12 Thread Stefan Beller

Which tool would you recommend to sort stuff?
Or rather the exact parameters for /usr/bin/sort ?

Thanks,
Stefan

On 07/12/2013 08:57 PM, Jonathan Nieder wrote:
 Stefan Beller wrote:
 
 --- a/.mailmap
 +++ b/.mailmap
 @@ -5,99 +5,146 @@
 [...]
  Chris Shoemaker c.shoema...@cox.net
 -Dan Johnson computerdr...@gmail.com
  Dana L. How dana...@gmail.com
  Dana L. How h...@deathvalley.cswitch.com
  Daniel Barkalow barka...@iabervon.org
 +Dan Johnson computerdr...@gmail.com
 
 Small nit: the sorting looks broken here and in similar places below
 (the usual ordering is Dan  Dana  Daniel).
 
 Thanks,
 Jonathan
 

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH] .mailmap: Map email addresses to names

2013-07-12 Thread Stefan Beller
From the man page

*** WARNING *** The locale specified by the environment affects sort
order.  Set LC_ALL=C to get the traditional sort  order  that  uses
   native byte values.

And indeed I can avoid being nitpicked again for wrong sorting. ;)

On 07/12/2013 09:02 PM, Stefan Beller wrote:
 
 Which tool would you recommend to sort stuff?
 Or rather the exact parameters for /usr/bin/sort ?
 
 Thanks,
 Stefan
 
 On 07/12/2013 08:57 PM, Jonathan Nieder wrote:
 Stefan Beller wrote:

 --- a/.mailmap
 +++ b/.mailmap
 @@ -5,99 +5,146 @@
 [...]
  Chris Shoemaker c.shoema...@cox.net
 -Dan Johnson computerdr...@gmail.com
  Dana L. How dana...@gmail.com
  Dana L. How h...@deathvalley.cswitch.com
  Daniel Barkalow barka...@iabervon.org
 +Dan Johnson computerdr...@gmail.com

 Small nit: the sorting looks broken here and in similar places below
 (the usual ordering is Dan  Dana  Daniel).

 Thanks,
 Jonathan

 

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH] .mailmap: Map email addresses to names

2013-07-12 Thread Stefan Beller
Ok I am sending all confirmed changes now again
in one big patch, as the sorting was wrong.

Stefan Beller (1):
  .mailmap: Map email addresses to names

 .mailmap | 135 +++
 1 file changed, 110 insertions(+), 25 deletions(-)

-- 
1.8.3.2.790.g9192b0b

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH] .mailmap: Map email addresses to names

2013-07-12 Thread Stefan Beller
People change email addresses quite often and sometimes
forget to add their entry to the mailmap file.
I have contacted lots of people, whose name occurs
multiple times in the short log having different
email addresses. The entries in the mailmap of
this patch are either confirmed by them or are trivial.
Trivial means different capitalisation of the domain
(@MIT.EDU and @mit.edu) or the domain was localhost,
(none) or @local.

Additionally to adding (name, email) mappings to the
.mailmap file, it has also been sorted alphabetically.
(which explains the removals, which are added
3 lines later on again). The sorting was done using
export LC_ALL=C; /usr/bin/sort without arguments.

While the most changes happen at the email addresses,
we also have a name change in here. Karl Hasselström
is now known as Karl Wiberg due to marriage. Congratulations!

To find out whom to contact I used the following small
script:
-
#!/bin/bash
git shortlog -sne |awk '{ NF--; $1=; print }' |sort |uniq -d  
mailmapdoubles
while read line ; do
# remove leading whitespace
trimmed=$(echo $line | sed -e 's/^ *//g' -e 's/ *$//g')
echo git shortlog -sne | grep \$trimmed\
done  mailmapdoubles  mailmapdoubles2
sh mailmapdoubles2
rm mailmapdoubles
rm mailmapdoubles2
-
Also interesting for similar tasks are these snippets:

# 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
-

Signed-off-by: Stefan Beller stefanbel...@googlemail.com
---
 .mailmap | 135 +++
 1 file changed, 110 insertions(+), 25 deletions(-)

diff --git a/.mailmap b/.mailmap
index 345cce6..22d3d70 100644
--- a/.mailmap
+++ b/.mailmap
@@ -5,99 +5,184 @@
 # same person appearing not to be so.
 #
 
+n...@fluxnic.net n...@cam.org
+Alejandro R. Sedeño ased...@mit.edu ased...@mit.edu
 Alex Bennée kernel-hac...@bennee.com
+Alex Riesen raa.l...@gmail.com fo...@t-online.de
+Alex Riesen raa.l...@gmail.com raa@limbo.localdomain
+Alex Riesen raa.l...@gmail.com r...@steel.home
+Alex Vandiver a...@chmrr.net ale...@mit.edu
 Alexander Gavrilov angavri...@gmail.com
+Alexey Shumkin alex.crez...@gmail.com zap...@mail.ru
+Anders Kaseorg ande...@mit.edu ande...@ksplice.com
+Anders Kaseorg ande...@mit.edu ande...@mit.edu
 Aneesh Kumar K.V aneesh.ku...@gmail.com
+Bernt Hansen be...@norang.ca be...@alumni.uwaterloo.ca
+Brandon Casey draf...@gmail.com ca...@nrlssc.navy.mil
 Brian M. Carlson sand...@crustytoothpaste.ath.cx
+Bryan Larsen br...@larsen.st bryan.lar...@gmail.com
+Bryan Larsen br...@larsen.st bryanlar...@yahoo.com
 Cheng Renquan crq...@gmail.com
 Chris Shoemaker c.shoema...@cox.net
 Dan Johnson computerdr...@gmail.com
 Dana L. How dana...@gmail.com
 Dana L. How h...@deathvalley.cswitch.com
 Daniel Barkalow barka...@iabervon.org
+David Brown g...@davidb.org dav...@quicinc.com
 David D. Kilzer ddkil...@kilzer.net
 David Kågedal dav...@lysator.liu.se
+David Reiss dre...@facebook.com dreiss@dreiss-vmware.(none)
 David S. Miller da...@davemloft.net
 Deskin Miller desk...@umich.edu
 Dirk Süsserott newslet...@dirk.my1.cc
+Eric Blake ebl...@redhat.com e...@byu.net
+Eric Hanchrow eric.hanch...@gmail.com off...@blarg.net
 Eric S. Raymond e...@thyrsus.com
 Erik Faye-Lund kusmab...@gmail.com kusmab...@googlemail.com
+Eyvind Bernhardsen eyvind.bernhard...@gmail.com eyvind-...@orakel.ntnu.no
+Florian Achleitner florian.achleitner.2.6...@gmail.com 
florian.achleitner2.6...@gmail.com
+Franck Bui-Huu vagabon@gmail.com fbui...@gmail.com
+Frank Lichtenheld fr...@lichtenheld.de dj...@debian.org
+Frank Lichtenheld fr...@lichtenheld.de flichtenh...@astaro.com
 Fredrik Kuivinen freku...@student.liu.se
 Frédéric Heitzmann frederic.heitzm...@gmail.com
 H. Merijn Brand h.m.br...@xs4all.nl H.Merijn Brand h.m.br...@xs4all.nl
-H. Peter Anvin h...@bonde.sc.orionmulti.com
-H. Peter Anvin h...@tazenda.sc.orionmulti.com
-H. Peter Anvin h...@trantor.hos.anvin.org
+H. Peter Anvin h...@zytor.com h...@bonde.sc.orionmulti.com
+H. Peter Anvin h...@zytor.com h...@smyrno.hos.anvin.org
+H. Peter Anvin h...@zytor.com h...@tazenda.sc.orionmulti.com
+H. Peter Anvin h...@zytor.com h...@trantor.hos.anvin.org
+Han-Wen Nienhuys han...@google.com Han-Wen Nienhuys han...@xs4all.nl
 Horst H. von Brand vonbr...@inf.utfsm.cl
-İsmail Dönmez ism...@pardus.org.tr
+J. Bruce Fields bfie...@citi.umich.edu bfie...@fieldses.org
+J. Bruce Fields bfie...@citi.umich.edu bfie...@pig.linuxdev.us.dell.com
+J. Bruce Fields bfie...@citi.umich.edu bfie...@puzzle.fieldses.org
 Jakub Narębski jna...@gmail.com
-Jay Soffian jaysoffian+...@gmail.com
+Jason Riedy e...@eecs.berkeley.edu e...@eecs.berkeley.edu
+Jason Riedy e...@eecs.berkeley.edu e...@cs.berkeley.edu
+Jay Soffian jaysoff...@gmail.com jaysoffian+...@gmail.com
 Jeff King p...@peff.net p...@github.com
+Jeff 

Re: [PATCH] .mailmap: Map email addresses to names

2013-07-12 Thread Junio C Hamano
Stefan Beller stefanbel...@googlemail.com writes:

 Ok I am sending all confirmed changes now again
 in one big patch, as the sorting was wrong.

 Stefan Beller (1):
   .mailmap: Map email addresses to names

So this corresponds to both of your patches, or just the first
batch?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH] .mailmap: Map email addresses to names

2013-07-12 Thread Junio C Hamano
Stefan Beller stefanbel...@googlemail.com writes:

 Additionally to adding (name, email) mappings to the
 .mailmap file, it has also been sorted alphabetically.
 (which explains the removals, which are added
 3 lines later on again).

What is this 3 lines later on again about?  Is it a remnant from
the previous iteration?  If so, I can remove this (which ...)
locally.

 While the most changes happen at the email addresses,
 we also have a name change in here. Karl Hasselström
 is now known as Karl Wiberg due to marriage. Congratulations!

Indeed.  I like this part of the log message ;-)
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html