summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2017-01-02 17:24:41 +0100
committerNikos Mavrogiannopoulos <nmav@redhat.com>2017-01-02 17:33:41 +0100
commit4494b0a2a191563ec354f76561bae410cde90c88 (patch)
tree20e9561bfd30dfa3f2ed340f336b8fc69ffbe265
parent2700f0f3b7e6cc76cf9f5de1567c95a6990e14bf (diff)
downloadgnutls-4494b0a2a191563ec354f76561bae410cde90c88.tar.gz
Simplified contribution policy [ci skip]
Also added a template to assist in the required steps to contribute. Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
-rw-r--r--CONTRIBUTING.md16
-rw-r--r--README.md10
-rw-r--r--devel/git-template2
3 files changed, 16 insertions, 12 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2d294b5f9e..88581b208c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -11,10 +11,18 @@ try to follow them too.
# Git commits:
- The original author of the changes should be the author of the commit.
-The "Signed-off-by" git flag is used to by committers to indicate they
-agreed with project's DCO as described in [DCO.txt](doc/DCO.txt). Note
-that we no longer require FSF copyright assignment.
+Note that when contributing code you will need to assert that the contribution is
+in accordance to the "Developer's Certificate of Origin" as found in the
+file [DCO.txt](doc/DCO.txt).
+
+To indicate that, make sure that your contributions (patches or merge requests),
+contain a "Signed-off-by" line, with your real name and e-mail address.
+To automate the process use "git am -s" to produce patches and/or set the
+a template to simplify this process, as follows.
+
+```
+git config commit.template devel/git-template
+```
# Test suite:
diff --git a/README.md b/README.md
index c06482e7f4..728a30bfc8 100644
--- a/README.md
+++ b/README.md
@@ -161,14 +161,8 @@ The Travis based CI, is used to test compilation on MacOSX based systems.
# Contributing
-If you wish to contribute, you may read more about our [coding style](CONTRIBUTING.md).
-Note that when contributing code that is not assigned to FSF, you will
-need to assert that the contribution is in accordance to the "Developer's
-Certificate of Origin" as found in the file [DCO.txt](doc/DCO.txt).
-That can be done by sending a mail with your real name to the gnutls-devel
-mailing list. Then just make sure that your contributions (patches),
-contain a "Signed-off-by" line, with your name and e-mail address.
-To automate the process use "git am -s" to produce patches.
+See [the contributing document](CONTRIBUTING.md).
+
Happy hacking!
diff --git a/devel/git-template b/devel/git-template
new file mode 100644
index 0000000000..6860e9488c
--- /dev/null
+++ b/devel/git-template
@@ -0,0 +1,2 @@
+
+Signed-off-by: Your Real Name <name@example.com>