23.08.2019. 01.13, "Philippe Mathieu-Daudé" <phi...@redhat.com> је написао/ла: > > Our mailmap currently has 4 sections somehow documented. > Reorder few entries not related to "addresses from the original > git import" into the 3rd section, and add a comment to describe > it. > > Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com> > ---
Just for the sake of tidiness, consider alphabetically ordering items in the new section. (This would've been a challenge though if we had had many Chinese contributors... :) ) In any case: Reviewed-by: Aleksandar Markovic <amarko...@wavecomp.com> > .mailmap | 17 +++++++++-------- > 1 file changed, 9 insertions(+), 8 deletions(-) > > diff --git a/.mailmap b/.mailmap > index b8e08297c9..e1fdc88d25 100644 > --- a/.mailmap > +++ b/.mailmap > @@ -4,20 +4,12 @@ > # into proper addresses so that they are counted properly by git shortlog. > Andrzej Zaborowski <balr...@gmail.com> balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> > Anthony Liguori <anth...@codemonkey.ws> aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> > -Anthony Liguori <anth...@codemonkey.ws> Anthony Liguori < aligu...@us.ibm.com> > Aurelien Jarno <aurel...@aurel32.net> aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> > Blue Swirl <blauwir...@gmail.com> blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> > Edgar E. Iglesias <edgar.igles...@gmail.com> edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162> > Fabrice Bellard <fabr...@bellard.org> bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> > -James Hogan <jho...@kernel.org> <james.ho...@imgtec.com> > Jocelyn Mayer <l_ind...@magic.fr> j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> > Paul Brook <p...@codesourcery.com> pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> > -Yongbok Kim <yongbok....@mips.com> <yongbok....@imgtec.com> > -Aleksandar Markovic <amarko...@wavecomp.com> < aleksandar.marko...@mips.com> > -Aleksandar Markovic <amarko...@wavecomp.com> < aleksandar.marko...@imgtec.com> > -Paul Burton <pbur...@wavecomp.com> <paul.bur...@mips.com> > -Paul Burton <pbur...@wavecomp.com> <paul.bur...@imgtec.com> > -Paul Burton <pbur...@wavecomp.com> <p...@archlinuxmips.org> > Thiemo Seufer <t...@networkno.de> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> > malc <av1...@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162> > > @@ -32,6 +24,15 @@ Ian McKellar <ianl...@google.com> Ian McKellar via Qemu-devel <qemu-devel@nongnu > Julia Suvorova <jus...@mail.ru> Julia Suvorova via Qemu-devel < qemu-devel@nongnu.org> > Justin Terry (VM) <jute...@microsoft.com> Justin Terry (VM) via Qemu-devel <qemu-devel@nongnu.org> > > +# Next, replace old addresses by a more recent one. > +Anthony Liguori <anth...@codemonkey.ws> Anthony Liguori < aligu...@us.ibm.com> > +James Hogan <jho...@kernel.org> <james.ho...@imgtec.com> > +Aleksandar Markovic <amarko...@wavecomp.com> < aleksandar.marko...@mips.com> > +Aleksandar Markovic <amarko...@wavecomp.com> < aleksandar.marko...@imgtec.com> > +Paul Burton <pbur...@wavecomp.com> <paul.bur...@mips.com> > +Paul Burton <pbur...@wavecomp.com> <paul.bur...@imgtec.com> > +Paul Burton <pbur...@wavecomp.com> <p...@archlinuxmips.org> > +Yongbok Kim <yongbok....@mips.com> <yongbok....@imgtec.com> > > # Also list preferred name forms where people have changed their > # git author config, or had utf8/latin1 encoding issues. > -- > 2.20.1 > >
