On Fri, Nov 03, 2023 at 02:02:47PM +0100, Uwe Kleine-König wrote: > When a single person uses different variants of their real name and > different email addresses, they appear as different persons in the > hall of fame in the category "Commits". > > With this .mailmap the number of individual committers is reduced from > 148 to 134 (as of ptxdist-2023.11.0) as produced by > > git shortlog -sn > > . > > Signed-off-by: Uwe Kleine-König <[email protected]> > --- > Hello, > > (implicit) v1 was sent with Message-Id: > <[email protected]> based on > 2023.05.0. > > I added a few more entries pointed out by Alexander Dahl to merge some > more entries. I was unsure if I should really merge Jürgen Beisert and > Juergen Borleis. While this is only one person, his name actually > changed, so I'm hesitant to merge. > > Best regards > Uwe > > .mailmap | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > create mode 100644 .mailmap > > diff --git a/.mailmap b/.mailmap > new file mode 100644 > index 000000000000..fb334866ce21 > --- /dev/null > +++ b/.mailmap > @@ -0,0 +1,16 @@ > +Andrej Gantvorg <[email protected]> > +Bjørn Bürger <[email protected]> > +Christian Gieseler <[email protected]> > +Christoph Rüdiger <[email protected]> > +Denis Osterland-Heim <[email protected]> > +Dennis Herbrich <[email protected]> > +Enrico Jorns <[email protected]> > +Enrico Jorns <[email protected]>
Is there a reason besides oversight why you put the "wrong" name in the file, so now Enrico is always credited as "Enrico Jorns" instead of "Enrico Jörns"? (The syntax according to the gitmailmap man page is "Proper Name <[email protected]>".) Otherwise I would suggest the following patch: diff --git a/.mailmap b/.mailmap index fb334866ce21..f5f8dc7419a2 100644 --- a/.mailmap +++ b/.mailmap @@ -4,12 +4,12 @@ Christian Gieseler <[email protected]> Christoph Rüdiger <[email protected]> Denis Osterland-Heim <[email protected]> Dennis Herbrich <[email protected]> -Enrico Jorns <[email protected]> -Enrico Jorns <[email protected]> +Enrico Jörns <[email protected]> +Enrico Jörns <[email protected]> Florian Bäuerle <[email protected]> Guillermo Rodríguez <[email protected]> -Jürgen Beisert <[email protected]> -Jürgen Beisert <[email protected]> +Jürgen Borleis <[email protected]> +Jürgen Borleis <[email protected]> Ladislav Michl <[email protected]> Ladislav Michl <[email protected]> Michael Olbrich <[email protected]> - Roland > +Florian Bäuerle <[email protected]> > +Guillermo Rodríguez <[email protected]> > +Jürgen Beisert <[email protected]> > +Jürgen Beisert <[email protected]> > +Ladislav Michl <[email protected]> > +Ladislav Michl <[email protected]> > +Michael Olbrich <[email protected]> > +Thorsten Liepert <[email protected]> > -- > 2.42.0 > > > -- Roland Hieber, Pengutronix e.K. | [email protected] | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
