From: "Ævar Arnfjörð Bjarmason" <avarab@gmail•com>
To: git@vger•kernel.org
Cc: "Junio C Hamano" <gitster@pobox•com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail•com>
Subject: [PATCH v2 0/2] CoC: update to 2.0 with less upstream divergence
Date: Mon, 28 Dec 2020 18:17:32 +0100 [thread overview]
Message-ID: <20201228171734.30038-1-avarab@gmail.com> (raw)
In-Reply-To: <xmqq5z4mjdbq.fsf@gitster.c.googlers.com>
Here's an alternate version of this update which is hopefully easier
to read diff-wise, and produces a smaller delta with the upstream
document.
With this version the diff to upstream is ~30 lines, with Junio's it's
~60. Specifically for this one:
BEGIN DIFF
diff --git a/code_of_conduct.md b/CODE_OF_CONDUCT.md
index 4e2473b8399..65651beada7 100644
--- a/code_of_conduct.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,5 +1,10 @@
+# Git Code of Conduct
-# Contributor Covenant Code of Conduct
+This code of conduct outlines our expectations for participants within
+the Git community, as well as steps for reporting unacceptable behavior.
+We are committed to providing a welcoming and inspiring community for
+all and expect our code of conduct to be honored. Anyone who violates
+this code of conduct may be banned from the community.
## Our Pledge
@@ -61,7 +66,13 @@ representative at an online or offline event.
Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
-[INSERT CONTACT METHOD].
+git@sfconservancy•org, or individually:
+
+ - Ævar Arnfjörð Bjarmason <avarab@gmail•com>
+ - Christian Couder <christian.couder@gmail•com>
+ - Jeff King <peff@peff•net>
+ - Junio C Hamano <gitster@pobox•com>
+
All complaints will be reviewed and investigated promptly and fairly.
All community leaders are obligated to respect the privacy and security of the
END DIFF
And for Junio's:
BEGIN DIFF
diff --git a/code_of_conduct.md b/CODE_OF_CONDUCT.md
index 4e2473b8399..ac13a84d1a4 100644
--- a/code_of_conduct.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,5 +1,10 @@
+# Git Code of Conduct
-# Contributor Covenant Code of Conduct
+This code of conduct outlines our expectations for participants within
+the Git community, as well as steps for reporting unacceptable behavior.
+We are committed to providing a welcoming and inspiring community for
+all and expect our code of conduct to be honored. Anyone who violates
+this code of conduct may be banned from the community.
## Our Pledge
@@ -60,8 +65,14 @@ representative at an online or offline event.
## Enforcement
Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-[INSERT CONTACT METHOD].
+reported to the community leaders responsible for enforcement by
+email as a whole at git@sfconservancy•org, or individually:
+
+ - Ævar Arnfjörð Bjarmason <avarab@gmail•com>
+ - Christian Couder <christian.couder@gmail•com>
+ - Jeff King <peff@peff•net>
+ - Junio C Hamano <gitster@pobox•com>
+
All complaints will be reviewed and investigated promptly and fairly.
All community leaders are obligated to respect the privacy and security of the
@@ -115,20 +126,13 @@ the community.
## Attribution
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+This Code of Conduct is adapted from the Contributor Covenant,
version 2.0, available at
-[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
-Community Impact Guidelines were inspired by
-[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+Community Impact Guidelines were inspired by
+Mozilla's code of conduct enforcement ladder.
For answers to common questions about this code of conduct, see the FAQ at
-[https://www.contributor-covenant.org/faq][FAQ]. Translations are available
-at [https://www.contributor-covenant.org/translations][translations].
-
-[homepage]: https://www.contributor-covenant.org
-[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html
-[Mozilla CoC]: https://github.com/mozilla/diversity
-[FAQ]: https://www.contributor-covenant.org/faq
-[translations]: https://www.contributor-covenant.org/translations
-
+https://www.contributor-covenant.org/faq. Translations are available
+at https://www.contributor-covenant.org/translations.
END DIFF
Ævar Arnfjörð Bjarmason (2):
CoC: Update word-wrapping to match upstream
CoC: update to version 2.0 + local changes
CODE_OF_CONDUCT.md | 154 ++++++++++++++++++++++++++++++---------------
1 file changed, 103 insertions(+), 51 deletions(-)
--
2.29.2.222.g5d2a92d10f8
next prev parent reply other threads:[~2020-12-28 17:18 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-28 12:59 [PATCH] CoC: update to 2.0 Junio C Hamano
2020-12-28 15:18 ` Derrick Stolee
2020-12-28 17:02 ` brian m. carlson
2020-12-28 17:17 ` Ævar Arnfjörð Bjarmason [this message]
2020-12-28 17:17 ` [PATCH v2 1/2] CoC: Update word-wrapping to match upstream Ævar Arnfjörð Bjarmason
2020-12-29 3:11 ` Jonathan Nieder
2021-01-04 23:43 ` Junio C Hamano
2020-12-28 17:17 ` [PATCH v2 2/2] CoC: update to version 2.0 + local changes Ævar Arnfjörð Bjarmason
2020-12-28 22:58 ` Junio C Hamano
2020-12-29 2:02 ` Elijah Newren
2020-12-29 18:36 ` Derrick Stolee
2020-12-30 8:20 ` Christian Couder
2021-01-04 23:47 ` Re* " Junio C Hamano
2021-01-07 23:28 ` Johannes Schindelin
2021-01-08 0:41 ` Junio C Hamano
2021-01-08 1:57 ` brian m. carlson
2020-12-29 3:17 ` Jonathan Nieder
2020-12-28 17:32 ` [PATCH] CoC: update to 2.0 Ævar Arnfjörð Bjarmason
2020-12-28 22:43 ` Junio C Hamano
2020-12-28 18:40 ` Emily Shaffer
2020-12-29 8:54 ` Pratyush Yadav
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=20201228171734.30038-1-avarab@gmail.com \
--to=avarab@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox