From 3d80f2e2b8905a4aa0f4b607eed5352d9508cca5 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Tue, 1 Oct 2024 13:51:41 +0000 Subject: [PATCH 1/3] doc: tweak onboarding instructions Add some additional guidance based on something we missed in a recent onboarding step. Signed-off-by: Michael Dawson --- onboarding.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/onboarding.md b/onboarding.md index e842c3b7e4eb57..bbebc7d1f66480 100644 --- a/onboarding.md +++ b/onboarding.md @@ -216,6 +216,11 @@ needs to be pointed out separately during the onboarding. `git show --format=%B 6669b3857f0f43ee0296eb7ac45086cd907b9e94` * Collaborators are in alphabetical order by GitHub username. * Optionally, include your personal pronouns. +* The PR should include an addition to the + [mailmap](https://github.com/nodejs/node/blob/main/.mailmap) file if the email + being added to the collaborator list does not match the email used for + commits. Otherwise tooling will not see the collaborator as being active and + may suggest removing them. * Add the `Fixes: ` to the commit message so that when the commit lands, the nomination issue url will be automatically closed. From ce3119320c6323ea7ff88b8506bc1fa15d3dd9ae Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Tue, 1 Oct 2024 14:22:52 +0000 Subject: [PATCH 2/3] squash: address comments Signed-off-by: Michael Dawson --- onboarding.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/onboarding.md b/onboarding.md index bbebc7d1f66480..84417eb44fc18a 100644 --- a/onboarding.md +++ b/onboarding.md @@ -220,7 +220,9 @@ needs to be pointed out separately during the onboarding. [mailmap](https://github.com/nodejs/node/blob/main/.mailmap) file if the email being added to the collaborator list does not match the email used for commits. Otherwise tooling will not see the collaborator as being active and - may suggest removing them. + may suggest removing them. See + [gitmailmap](https://git-scm.com/docs/gitmailmap) for information on the + format of the mailmap file. * Add the `Fixes: ` to the commit message so that when the commit lands, the nomination issue url will be automatically closed. From de2854688d3c38254c38bb41837a5be91bc7fc8b Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Wed, 2 Oct 2024 10:23:10 -0400 Subject: [PATCH 3/3] Update onboarding.md Co-authored-by: Aviv Keller --- onboarding.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onboarding.md b/onboarding.md index 84417eb44fc18a..0731161a4c4e25 100644 --- a/onboarding.md +++ b/onboarding.md @@ -217,7 +217,7 @@ needs to be pointed out separately during the onboarding. * Collaborators are in alphabetical order by GitHub username. * Optionally, include your personal pronouns. * The PR should include an addition to the - [mailmap](https://github.com/nodejs/node/blob/main/.mailmap) file if the email + [mailmap](.mailmap) file if the email being added to the collaborator list does not match the email used for commits. Otherwise tooling will not see the collaborator as being active and may suggest removing them. See