* [PATCH] mailmap: Update comments for with format and more detalis
@ 2020-08-08 7:14 Kees Cook
2020-08-08 17:34 ` Joe Perches
2020-08-11 16:46 ` Jonathan Corbet
0 siblings, 2 replies; 4+ messages in thread
From: Kees Cook @ 2020-08-08 7:14 UTC (permalink / raw)
To: Jonathan Corbet; +Cc: Andrew Morton, linux-kernel, linux-doc
Without having first read the git-shortlog man-page first, the format
of .mailmap may not be immediately obvious. Add comments with pointers
to the man-page, along with other details.
Signed-off-by: Kees Cook <keescook@chromium.org>
---
I'm adding this to my earlier .mailmap update series:
https://lore.kernel.org/lkml/20200730183702.702552-1-keescook@chromium.org/
---
.mailmap | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/.mailmap b/.mailmap
index 6c1c04a63b18..3a991e19928c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -2,11 +2,16 @@
# This list is used by git-shortlog to fix a few botched name translations
# in the git archive, either because the author's full name was messed up
# and/or not always written the same way, making contributions from the
-# same person appearing not to be so or badly displayed.
+# same person appearing not to be so or badly displayed. Also allows for
+# old email addresses to map to new email addresses.
#
+# For format details, see "MAPPING AUTHORS" in "man git-shortlog".
+#
+# Please keep this list dictionary sorted.
+#
+# This comment is parsed by git-shortlog:
# repo-abbrev: /pub/scm/linux/kernel/git/
#
-
Aaron Durbin <adurbin@google.com>
Adam Oldham <oldhamca@gmail.com>
Adam Radford <aradford@gmail.com>
--
2.25.1
--
Kees Cook
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] mailmap: Update comments for with format and more detalis
2020-08-08 7:14 [PATCH] mailmap: Update comments for with format and more detalis Kees Cook
@ 2020-08-08 17:34 ` Joe Perches
2020-08-11 16:46 ` Jonathan Corbet
1 sibling, 0 replies; 4+ messages in thread
From: Joe Perches @ 2020-08-08 17:34 UTC (permalink / raw)
To: Kees Cook, Jonathan Corbet; +Cc: Andrew Morton, linux-kernel, linux-doc
On Sat, 2020-08-08 at 00:14 -0700, Kees Cook wrote:
> Without having first read the git-shortlog man-page first, the format
> of .mailmap may not be immediately obvious. Add comments with pointers
> to the man-page, along with other details.
>
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
> I'm adding this to my earlier .mailmap update series:
> https://lore.kernel.org/lkml/20200730183702.702552-1-keescook@chromium.org/
> ---
> .mailmap | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/.mailmap b/.mailmap
> index 6c1c04a63b18..3a991e19928c 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -2,11 +2,16 @@
> # This list is used by git-shortlog
and scripts/get_maintainer.pl
Today, this list is primarily used not for
messed up email addresses. It's mostly used
to map no longer in-use email addresses to
current email address.
> to fix a few botched name translations
> # in the git archive, either because the author's full name was messed up
> # and/or not always written the same way, making contributions from the
> -# same person appearing not to be so or badly displayed.
> +# same person appearing not to be so or badly displayed. Also allows for
> +# old email addresses to map to new email addresses.
> #
> +# For format details, see "MAPPING AUTHORS" in "man git-shortlog".
> +#
> +# Please keep this list dictionary sorted.
> +#
> +# This comment is parsed by git-shortlog:
> # repo-abbrev: /pub/scm/linux/kernel/git/
> #
> -
> Aaron Durbin <adurbin@google.com>
> Adam Oldham <oldhamca@gmail.com>
> Adam Radford <aradford@gmail.com>
> --
> 2.25.1
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] mailmap: Update comments for with format and more detalis
2020-08-08 7:14 [PATCH] mailmap: Update comments for with format and more detalis Kees Cook
2020-08-08 17:34 ` Joe Perches
@ 2020-08-11 16:46 ` Jonathan Corbet
2020-08-11 21:24 ` Kees Cook
1 sibling, 1 reply; 4+ messages in thread
From: Jonathan Corbet @ 2020-08-11 16:46 UTC (permalink / raw)
To: Kees Cook; +Cc: Andrew Morton, linux-kernel, linux-doc
On Sat, 8 Aug 2020 00:14:36 -0700
Kees Cook <keescook@chromium.org> wrote:
> Without having first read the git-shortlog man-page first, the format
> of .mailmap may not be immediately obvious. Add comments with pointers
> to the man-page, along with other details.
>
> Signed-off-by: Kees Cook <keescook@chromium.org>
Applied, thanks. I did take the liberty of removing the redundant "first"
from the changelog, though :)
jon
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] mailmap: Update comments for with format and more detalis
2020-08-11 16:46 ` Jonathan Corbet
@ 2020-08-11 21:24 ` Kees Cook
0 siblings, 0 replies; 4+ messages in thread
From: Kees Cook @ 2020-08-11 21:24 UTC (permalink / raw)
To: Jonathan Corbet; +Cc: Andrew Morton, linux-kernel, linux-doc
On Tue, Aug 11, 2020 at 10:46:14AM -0600, Jonathan Corbet wrote:
> On Sat, 8 Aug 2020 00:14:36 -0700
> Kees Cook <keescook@chromium.org> wrote:
>
> > Without having first read the git-shortlog man-page first, the format
> > of .mailmap may not be immediately obvious. Add comments with pointers
> > to the man-page, along with other details.
> >
> > Signed-off-by: Kees Cook <keescook@chromium.org>
>
> Applied, thanks. I did take the liberty of removing the redundant "first"
> from the changelog, though :)
It seems I can only edit other people's writing. ;)
Thank you!
--
Kees Cook
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-08-11 21:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-08 7:14 [PATCH] mailmap: Update comments for with format and more detalis Kees Cook
2020-08-08 17:34 ` Joe Perches
2020-08-11 16:46 ` Jonathan Corbet
2020-08-11 21:24 ` Kees Cook
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).