kernel/git - git - PowerEL Git System

Author	SHA1	Message	Date
Ævar Arnfjörð Bjarmason	0d28d3cf33	CoC: update to version 2.0 + local changes Update the CoC added in `5cdf2301` (add a Code of Conduct document, 2019-09-24 from version 1.4 to version 2.0. This is the version found at [1] with the following minor changes: - We preserve the change to the CoC in `3f9ef874a7` (CODE_OF_CONDUCT: mention individual project-leader emails, 2019-09-26) - We preserve the custom intro added in `5cdf2301d4` (add a Code of Conduct document, 2019-09-24) This change intentionally preserves a warning emitted on "git diff --check". It's better to make it easily diff-able with upstream than to fix whitespace changes in our version while we're at it. 1. https://www.contributor-covenant.org/version/2/0/code_of_conduct/code_of_conduct.md Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Acked-by: Christian Couder <chriscool@tuxfamily.org> Acked-by: Derrick Stolee <dstolee@microsoft.com> Acked-by: Elijah Newren <newren@gmail.com> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: brian m. carlson <sandals@crustytoothpaste.net> Acked-by: Jeff King <peff@peff.net> Acked-by: Taylor Blau <me@ttaylor.com> Acked-by: Jonathan Tan <jonathantanmy@google.com> Acked-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	4 years ago
Ævar Arnfjörð Bjarmason	cb50786f49	CoC: Update word-wrapping to match upstream When the CoC document was added in `5cdf2301d4` (add a Code of Conduct document, 2019-09-24) it was added from some 1.4 version of the document whose word wrapping doesn't match what's currently at [1], which matches content/version/1/4/code-of-conduct.md in the CoC repository[2]. Let's update our version to match that, to make reading subsequent diffs easier. There are no non-whitespace changes here. 1. https://www.contributor-covenant.org/version/1/4/code-of-conduct/ 2. https://github.com/ContributorCovenant/contributor_covenant Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	4 years ago
Jeff King	3f9ef874a7	CODE_OF_CONDUCT: mention individual project-leader emails It's possible that somebody on the project committee is the subject of a complaint. In that case, it may be useful to be able to contact the other members individually, so let's make it clear that's an option. This also serves to enumerate the set of people on the committee. That lets you easily _know_ if you're in the situation mentioned above. And it's just convenient to list who's involved in the process, since the project committee list is not anywhere else in the repository. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>	5 years ago
Jeff King	5cdf2301d4	add a Code of Conduct document We've never had a formally written Code of Conduct document. Though it has been discussed off and on over the years, for the most part the behavior on the mailing list has been good enough that nobody felt the need to push one forward. However, even if there aren't specific problems now, it's a good idea to have a document: - it puts everybody on the same page with respect to expectations. This might avoid poor behavior, but also makes it easier to handle it if it does happen. - it publicly advertises that good conduct is important to us and will be enforced, which may make some people more comfortable with joining our community - it may be a good time to cement our expectations when things are quiet, since it gives everybody some distance rather than focusing on a current contentious issue This patch adapts the Contributor Covenant Code of Conduct. As opposed to writing our own from scratch, this uses common and well-accepted language, and strikes a good balance between illustrating expectations and avoiding a laundry list of behaviors. It's also the same document used by the Git for Windows project. The text is taken mostly verbatim from: https://www.contributor-covenant.org/version/1/4/code-of-conduct.html I also stole a very nice introductory paragraph from the Git for Windows version of the file. There are a few subtle points, though: - the document refers to "the project maintainers". For the code, we generally only consider there to be one maintainer: Junio C Hamano. But for dealing with community issues, it makes sense to involve more people to spread the responsibility. I've listed the project committee address of git@sfconservancy.org as the contact point. - the document mentions banning from the community, both in the intro paragraph and in "Our Responsibilities". The exact mechanism here is left vague. I can imagine it might start with social enforcement (not accepting patches, ignoring emails) and could escalate to technical measures if necessary (asking vger admins to block an address). It probably make sense _not_ to get too specific at this point, and deal with specifics as they come up. Signed-off-by: Jeff King <peff@peff.net> Acked-by: CB Bailey <cb@hashpling.org> Acked-by: Christian Couder <chriscool@tuxfamily.org> Acked-by: Emily Shaffer <emilyshaffer@google.com> Acked-by: Garima Singh <garimasigit@gmail.com> Acked-by: Junio C Hamano <gitster@pobox.com> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Acked-by: Jonathan Tan <jonathantanmy@google.com> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Taylor Blau <me@ttaylorr.com> Acked-by: Elijah Newren <newren@gmail.com> Acked-by: Phillip Wood <phillip.wood@dunelm.org.uk> Acked-by: brian m. carlson <sandals@crustytoothpaste.net> Acked-by: Derrick Stolee <stolee@gmail.com> Acked-by: Thomas Gummerer <t.gummerer@gmail.com> Acked-by: William Baker <williamtbakeremail@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	5 years ago