Message ID | 20190822230916.576-2-philmd@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | mailmap: Clean up | expand |
23.08.2019. 01.13, "Philippe Mathieu-Daudé" <philmd@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é <philmd@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 <amarkovic@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 <balrogg@gmail.com> balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> > Anthony Liguori <anthony@codemonkey.ws> aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> > -Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori < aliguori@us.ibm.com> > Aurelien Jarno <aurelien@aurel32.net> aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> > Blue Swirl <blauwirbel@gmail.com> blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> > Edgar E. Iglesias <edgar.iglesias@gmail.com> edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162> > Fabrice Bellard <fabrice@bellard.org> bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> > -James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com> > Jocelyn Mayer <l_indien@magic.fr> j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> > Paul Brook <paul@codesourcery.com> pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> > -Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com> > -Aleksandar Markovic <amarkovic@wavecomp.com> < aleksandar.markovic@mips.com> > -Aleksandar Markovic <amarkovic@wavecomp.com> < aleksandar.markovic@imgtec.com> > -Paul Burton <pburton@wavecomp.com> <paul.burton@mips.com> > -Paul Burton <pburton@wavecomp.com> <paul.burton@imgtec.com> > -Paul Burton <pburton@wavecomp.com> <paul@archlinuxmips.org> > Thiemo Seufer <ths@networkno.de> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> > malc <av1474@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162> > > @@ -32,6 +24,15 @@ Ian McKellar <ianloic@google.com> Ian McKellar via Qemu-devel <qemu-devel@nongnu > Julia Suvorova <jusual@mail.ru> Julia Suvorova via Qemu-devel < qemu-devel@nongnu.org> > Justin Terry (VM) <juterry@microsoft.com> Justin Terry (VM) via Qemu-devel <qemu-devel@nongnu.org> > > +# Next, replace old addresses by a more recent one. > +Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori < aliguori@us.ibm.com> > +James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com> > +Aleksandar Markovic <amarkovic@wavecomp.com> < aleksandar.markovic@mips.com> > +Aleksandar Markovic <amarkovic@wavecomp.com> < aleksandar.markovic@imgtec.com> > +Paul Burton <pburton@wavecomp.com> <paul.burton@mips.com> > +Paul Burton <pburton@wavecomp.com> <paul.burton@imgtec.com> > +Paul Burton <pburton@wavecomp.com> <paul@archlinuxmips.org> > +Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com> > > # Also list preferred name forms where people have changed their > # git author config, or had utf8/latin1 encoding issues. > -- > 2.20.1 > >
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 <balrogg@gmail.com> balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> Anthony Liguori <anthony@codemonkey.ws> aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> -Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com> Aurelien Jarno <aurelien@aurel32.net> aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> Blue Swirl <blauwirbel@gmail.com> blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> Edgar E. Iglesias <edgar.iglesias@gmail.com> edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162> Fabrice Bellard <fabrice@bellard.org> bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> -James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com> Jocelyn Mayer <l_indien@magic.fr> j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> Paul Brook <paul@codesourcery.com> pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> -Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com> -Aleksandar Markovic <amarkovic@wavecomp.com> <aleksandar.markovic@mips.com> -Aleksandar Markovic <amarkovic@wavecomp.com> <aleksandar.markovic@imgtec.com> -Paul Burton <pburton@wavecomp.com> <paul.burton@mips.com> -Paul Burton <pburton@wavecomp.com> <paul.burton@imgtec.com> -Paul Burton <pburton@wavecomp.com> <paul@archlinuxmips.org> Thiemo Seufer <ths@networkno.de> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> malc <av1474@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162> @@ -32,6 +24,15 @@ Ian McKellar <ianloic@google.com> Ian McKellar via Qemu-devel <qemu-devel@nongnu Julia Suvorova <jusual@mail.ru> Julia Suvorova via Qemu-devel <qemu-devel@nongnu.org> Justin Terry (VM) <juterry@microsoft.com> Justin Terry (VM) via Qemu-devel <qemu-devel@nongnu.org> +# Next, replace old addresses by a more recent one. +Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com> +James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com> +Aleksandar Markovic <amarkovic@wavecomp.com> <aleksandar.markovic@mips.com> +Aleksandar Markovic <amarkovic@wavecomp.com> <aleksandar.markovic@imgtec.com> +Paul Burton <pburton@wavecomp.com> <paul.burton@mips.com> +Paul Burton <pburton@wavecomp.com> <paul.burton@imgtec.com> +Paul Burton <pburton@wavecomp.com> <paul@archlinuxmips.org> +Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com> # Also list preferred name forms where people have changed their # git author config, or had utf8/latin1 encoding issues.
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é <philmd@redhat.com> --- .mailmap | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)