From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Fangyi Zhou <me@fangyi.io>
Cc: git@vger.kernel.org, "Peter Kaestle" <peter@piie.net>,
"Martin Ågren" <martin.agren@gmail.com>
Subject: Re: [PATCH v2] .mailmap: Update mailmap entry for Fangyi Zhou and Peter Kaestle
Date: Mon, 20 Sep 2021 13:18:58 +0200 [thread overview]
Message-ID: <877dfbbigr.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <20210920084719.29122-1-me@fangyi.io>
On Mon, Sep 20 2021, Fangyi Zhou wrote:
> Acked-by: Peter Kaestle <peter@piie.net>
> Signed-off-by: Fangyi Zhou <me@fangyi.io>
> ---
> .mailmap | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/.mailmap b/.mailmap
> index 9c6a446bdf..854f397796 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -70,7 +70,8 @@ Eric S. Raymond <esr@thyrsus.com>
> Eric Wong <e@80x24.org> <normalperson@yhbt.net>
> Erik Faye-Lund <kusmabite@gmail.com> <kusmabite@googlemail.com>
> Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com> <eyvind-git@orakel.ntnu.no>
> -Fangyi Zhou <fangyi.zhou@yuriko.moe> Zhou Fangyi
> +Fangyi Zhou <me@fangyi.io> <fangyi.zhou@yuriko.moe>
> +Fangyi Zhou <me@fangyi.io> Zhou Fangyi <fangyi.zhou@yuriko.moe>
> Florian Achleitner <florian.achleitner.2.6.31@gmail.com> <florian.achleitner2.6.31@gmail.com>
> Franck Bui-Huu <vagabon.xyz@gmail.com> <fbuihuu@gmail.com>
> Frank Lichtenheld <frank@lichtenheld.de> <djpig@debian.org>
> @@ -209,6 +210,7 @@ Paul Mackerras <paulus@samba.org> <paulus@dorrigo.(none)>
> Paul Mackerras <paulus@samba.org> <paulus@pogo.(none)>
> Peter Baumann <waste.manager@gmx.de> <Peter.B.Baumann@stud.informatik.uni-erlangen.de>
> Peter Baumann <waste.manager@gmx.de> <siprbaum@stud.informatik.uni-erlangen.de>
> +Peter Kaestle <peter@piie.net> <peter.kaestle@nokia.com>
> Peter Krefting <peter@softwolves.pp.se> <peter@softwolves.pp.se>
> Peter Krefting <peter@softwolves.pp.se> <peter@svarten.intern.softwolves.pp.se>
> Petr Baudis <pasky@ucw.cz> <pasky@suse.cz>
I'm sure the maintainer would appreciate you and Martin Ågren
<martin.agren@gmail.com> (CC'd) coordinating, i.e. there's also this
outstanding change that overlaps with yours:
https://lore.kernel.org/git/20200816153037.1143576-1-martin.agren@gmail.com/
I.e. can everyone who wants to update the mailmap consolidate their
discussion/changes into one thread and come up with some recipe that
works for all of them?
FWIW I validated the change you made, while you could do your hunk more
minimally as:
-Fangyi Zhou <fangyi.zhou@yuriko.moe> Zhou Fangyi
+Fangyi Zhou <fangyi.zhou@yuriko.moe>
+<fangyi.zhou@yuriko.moe> <me@fangyi.io>
I understand per recent mailmap discussion that Junio prefers having the
entries sorted over eliminating redundancy.
next prev parent reply other threads:[~2021-09-20 11:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-20 8:47 [PATCH v2] .mailmap: Update mailmap entry for Fangyi Zhou and Peter Kaestle Fangyi Zhou
2021-09-20 11:18 ` Ævar Arnfjörð Bjarmason [this message]
2021-09-20 19:28 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=877dfbbigr.fsf@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=martin.agren@gmail.com \
--cc=me@fangyi.io \
--cc=peter@piie.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.