From 858b41d835fe07ff7486440ab07f1b0d30065eb8 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 22 Mar 2019 11:51:07 +0000 Subject: [PATCH 1/2] Clarify the meaning of 'real name' for contribution This applies the clarification already adopted by Synapse: https://github.com/matrix-org/synapse/commit/ec766b25303b420850e6d2875f156f23109acf6a --- CONTRIBUTING.rst | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 436136430..99b35d531 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -109,10 +109,14 @@ include the line in your commit or pull request comment:: Signed-off-by: Your Name -...using your real name; unfortunately pseudonyms and anonymous contributions -can't be accepted. Git makes this trivial - just use the -s flag when you do -``git commit``, having first set ``user.name`` and ``user.email`` git configs -(which you should have done anyway :) +We accept contributions under a legally identifiable name, such as your name on +government documentation or common-law names (names claimed by legitimate usage +or repute). Unfortunately, we cannot accept anonymous contributions at this +time. + +Git allows you to add this signoff automatically when using the ``-s`` flag to +``git commit``, which uses the name and email set in your ``user.name`` and +``user.email`` git configs. If you forgot to sign off your commits before making your pull request and are on git 2.17+ you can mass signoff using rebase:: From 8d249a843cf4564c95437cf608e6bdac4b8b63cb Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Fri, 22 Mar 2019 11:53:43 +0000 Subject: [PATCH 2/2] Reformat contribution doc to 80 chars --- CONTRIBUTING.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 99b35d531..b4b7f67f1 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -24,7 +24,7 @@ works. Develop is the unstable branch where all the development actually happens: the workflow is that contributors should fork the develop branch to make a 'feature' branch for a particular contribution, and then make a pull request to merge this back into the matrix.org 'official' develop branch. We -use github's pull request workflow to review the contribution, and either ask +use GitHub's pull request workflow to review the contribution, and either ask you to make any refinements needed or merge it and make them ourselves. The changes will then land on master when we next do a release. @@ -60,8 +60,8 @@ Sign off ~~~~~~~~ In order to have a concrete record that your contribution is intentional -and you agree to license it under the same terms as the project's license, we've adopted the -same lightweight approach that the Linux Kernel +and you agree to license it under the same terms as the project's license, we've +adopted the same lightweight approach that the Linux Kernel (https://www.kernel.org/doc/Documentation/SubmittingPatches), Docker (https://github.com/docker/docker/blob/master/CONTRIBUTING.md), and many other projects use: the DCO (Developer Certificate of Origin: @@ -118,7 +118,7 @@ Git allows you to add this signoff automatically when using the ``-s`` flag to ``git commit``, which uses the name and email set in your ``user.name`` and ``user.email`` git configs. -If you forgot to sign off your commits before making your pull request and are on git 2.17+ -you can mass signoff using rebase:: +If you forgot to sign off your commits before making your pull request and are +on Git 2.17+ you can mass signoff using rebase:: git rebase --signoff origin/develop