On 08/12/2013 09:58 AM, Junio C Hamano wrote: > Junio C Hamano <gits...@pobox.com> writes: > >> I'd suggest using the lavabit address unless we hear the preferred >> address from her, as the lavabit address was used in 5bf46841 >> (git-gui: update Japanese translation, 2010-02-02), while the last >> use of the bluebottle address was in 6762079a (Cloning from a repo >> without "current branch", 2007-06-16). > > So with the above, and the four responses from long-lost friends, > here is what I came up with. > > -- >8 -- > Subject: .mailmap: update long-lost friends with multiple defunct addresses > > A handful of past contributors are recorded with multiple e-mail > addresses, all of which are undeliberable. With a lot of help from > Jonathan, we located all of them except for one. Update the found > ones with their currently preferred address, and use the last known > address to consolidate contributions by the lost person under a > single entry. > > Helped-by: Stefan Beller <stefanbel...@googlemail.com> > Helped-by: Jonathan Nieder <jrnie...@gmail.com> > Signed-off-by: Junio C Hamano <gits...@pobox.com> > --- > .mailmap | 14 +++++++++++++- > 1 file changed, 13 insertions(+), 1 deletion(-) > > diff --git a/.mailmap b/.mailmap > index f7cc21e..7a5d0a6 100644 > --- a/.mailmap > +++ b/.mailmap > @@ -18,6 +18,8 @@ Alexey Shumkin <alex.crez...@gmail.com> > <alex.crez...@gmail.com> > Anders Kaseorg <ande...@mit.edu> <ande...@ksplice.com> > Anders Kaseorg <ande...@mit.edu> <ande...@mit.edu> > Aneesh Kumar K.V <aneesh.ku...@gmail.com> > +Amos Waterland <a...@debian.org> <a...@rossby.metr.ou.edu> > +Amos Waterland <a...@debian.org> <a...@us.ibm.com> > Ben Walton <bdwal...@gmail.com> <bwal...@artsci.utoronto.ca> > Bernt Hansen <be...@norang.ca> <be...@alumni.uwaterloo.ca> > Brandon Casey <draf...@gmail.com> <ca...@nrlssc.navy.mil> > @@ -34,6 +36,8 @@ Dan Johnson <computerdr...@gmail.com> > Dana L. How <dana...@gmail.com> <h...@deathvalley.cswitch.com> > Dana L. How <dana...@gmail.com> Dana How > Daniel Barkalow <barka...@iabervon.org> > +Daniel Trstenjak <daniel.trsten...@gmail.com> <daniel.trsten...@online.de> > +Daniel Trstenjak <daniel.trsten...@gmail.com> <trs...@science-computing.de> > David Brown <g...@davidb.org> <dav...@quicinc.com> > David D. Kilzer <ddkil...@kilzer.net> > David Kågedal <dav...@lysator.liu.se> > @@ -68,11 +72,17 @@ 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> > James Y Knight <jkni...@itasoftware.com> <f...@fuhm.net> > +# The 2 following authors are probably the same person, > +# but both emails bounce.
You seemed to be sure about Nanako Shiraishi for example, but here you're uncertain, whether he is one person or 2 persons having the same name? I, as a really new contributor, tried a very conservative approach as specially the mailmap is a sensitive field. So in case you'd know he is one person with just different emails, maybe we could write +Jason McMullan <jason.mcmul...@timesys.com> <mcmul...@netapp.com> as it doesn't matter which email comes first (both bounce anyway). > +Jason McMullan <jason.mcmul...@timesys.com> > +Jason McMullan <mcmul...@netapp.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 Muizelaar <jmuizel...@mozilla.com> <j...@infidigm.net> > +Jens Axboe <ax...@kernel.dk> <ax...@suse.de> > +Jens Axboe <ax...@kernel.dk> <jens.ax...@oracle.com> > Jim Meyering <j...@meyering.net> <meyer...@redhat.com> > Joachim Berdal Haga <cjh...@fys.uio.no> > Johannes Schindelin <johannes.schinde...@gmx.de> <johannes.schinde...@gmx.de> > @@ -144,7 +154,7 @@ Michele Ballabio <barra_c...@katamail.com> > Miklos Vajna <vmik...@frugalware.org> <vmik...@suse.cz> > Namhyung Kim <namhy...@gmail.com> <namhyung....@lge.com> > Namhyung Kim <namhy...@gmail.com> <namhy...@kernel.org> > -Nanako Shiraishi <nana...@bluebottle.com> > +Nanako Shiraishi <nana...@lavabit.com> <nana...@bluebottle.com> > Nanako Shiraishi <nana...@lavabit.com> > Nelson Elhage <nelh...@mit.edu> <nelh...@mit.edu> > Nelson Elhage <nelh...@mit.edu> <nelh...@ksplice.com> > @@ -177,6 +187,8 @@ Robert Fitzsimons <robf...@273k.net> > Robert Shearman <robertshear...@gmail.com> <r...@codeweavers.com> > Robert Zeh <robert.a....@gmail.com> > Robin Rosenberg <robin.rosenb...@dewire.com> > <robin.rosenberg.li...@dewire.com> > +Rutger Nijlunsing <rutger.nijluns...@gmail.com> <rut...@nospam.com> > +Rutger Nijlunsing <rutger.nijluns...@gmail.com> <g...@tux.tmfweb.nl> > Ryan Anderson <r...@michonline.com> <r...@google.com> > Salikh Zakirov <salikh.zaki...@gmail.com> <salikh.zaki...@intel.com> > Sam Vilain <s...@vilain.net> <sam.vil...@catalyst.net.nz> > Ok, I've got more responses, which will follow in the next mail.
signature.asc
Description: OpenPGP digital signature
