| Submitter | Peter Maydell |
|---|---|
| Date | Dec. 1, 2011, 6:55 p.m. |
| Message ID | <1322765724-24393-1-git-send-email-peter.maydell@linaro.org> |
| Download | mbox | patch |
| Permalink | /patch/128740/ |
| State | New |
| Headers | show |
Comments
Am 01.12.2011 19:55, schrieb Peter Maydell: > Add a .mailmap file so 'git shortlog' can map the unfriendly > pre-git-conversion author entries to real names. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > v1->v2: > fixed Andrzej's email to match MAINTAINERS file > added entries for Fabrice Bellard, Jocelyn Mayer > cc'd active maintainers with an entry in the mailmap > > .mailmap | 16 ++++++++++++++++ > 1 files changed, 16 insertions(+), 0 deletions(-) > create mode 100644 .mailmap > > diff --git a/.mailmap b/.mailmap > new file mode 100644 > index 0000000..80ea514 > --- /dev/null > +++ b/.mailmap > @@ -0,0 +1,16 @@ > +# This mailmap just translates the weird addresses from the original > import into git > +# into proper addresses so that they are counted properly in git > shortlog output. > +# > +Aurelien Jarno <aurelien@aurel32.net> aurel32 > <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> > +Blue Swirl <blauwirbel@gmail.com> blueswir1 > <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> > +Anthony Liguori <aliguori@us.ibm.com> aliguori > <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> > +Edgar E. Iglesias <edgar.iglesias@gmail.com> edgar_igl > <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162> > +malc <av1474@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162> > +Paul Brook <paul@codesourcery.com> pbrook > <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> > +Andrzej Zaborowski <balrogg@gmail.com> balrog > <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> > +Thiemo Seufer <ths@networkno.de> ths > <ths@c046a42c-6fe2-441c-8c8c-71466251a162> > +Fabrice Bellard <fabrice@bellard.org> bellard > <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> > +Jocelyn Mayer <l_indien@magic.fr> j_mayer > <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> > +# There is also a: > +# (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162> > +# for the cvs2svn initialization commit e63c3dc74bf. I suggest keeping this list sorted (alphabetically, starting with first column). That makes adding new entries easier. New entries are useful for doublets like this one: Venkateswararao Jujjuri Venkateswararao Jujjuri (JV) Regards Stefan
On 1 December 2011 19:45, Stefan Weil <sw@weilnetz.de> wrote: > I suggest keeping this list sorted (alphabetically, starting with first > column). > That makes adding new entries easier. Makes sense. Will do that in v3 (but will wait a bit to see if we get any further comments first). > New entries are useful for doublets > like this one: > > Venkateswararao Jujjuri > Venkateswararao Jujjuri (JV) I wasn't planning to include removing duplicates in the scope of this initial patch (since that requires checking with the people concerned about which one is their preferred form). We can always add entries later. -- PMM
> Add a .mailmap file so 'git shortlog' can map the unfriendly > pre-git-conversion author entries to real names. >+Paul Brook> <paul@codesourcery.com> pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> This bit looks ok to me. Paul
Patch
diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000..80ea514 --- /dev/null +++ b/.mailmap @@ -0,0 +1,16 @@ +# This mailmap just translates the weird addresses from the original import into git +# into proper addresses so that they are counted properly in git shortlog output. +# +Aurelien Jarno <aurelien@aurel32.net> aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> +Blue Swirl <blauwirbel@gmail.com> blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> +Anthony Liguori <aliguori@us.ibm.com> aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> +Edgar E. Iglesias <edgar.iglesias@gmail.com> edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162> +malc <av1474@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162> +Paul Brook <paul@codesourcery.com> pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> +Andrzej Zaborowski <balrogg@gmail.com> balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> +Thiemo Seufer <ths@networkno.de> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> +Fabrice Bellard <fabrice@bellard.org> bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> +Jocelyn Mayer <l_indien@magic.fr> j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> +# There is also a: +# (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162> +# for the cvs2svn initialization commit e63c3dc74bf.
Add a .mailmap file so 'git shortlog' can map the unfriendly pre-git-conversion author entries to real names. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- v1->v2: fixed Andrzej's email to match MAINTAINERS file added entries for Fabrice Bellard, Jocelyn Mayer cc'd active maintainers with an entry in the mailmap .mailmap | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) create mode 100644 .mailmap