Add a note in the contributing file about trivial commits.

A better explanation of where the "CLA: trivial" line goes and how to add
it post hoc.

Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/9265)
This commit is contained in:
Pauli 2019-06-27 18:45:26 +10:00
parent da93b5cc2b
commit e955edcda6

View file

@ -19,8 +19,16 @@ guidelines:
1. Anything other than a trivial contribution requires a Contributor 1. Anything other than a trivial contribution requires a Contributor
License Agreement (CLA), giving us permission to use your code. See License Agreement (CLA), giving us permission to use your code. See
https://www.openssl.org/policies/cla.html for details. If your https://www.openssl.org/policies/cla.html for details. If your
contribution is too small to require a CLA, put "CLA: trivial" on a contribution is too small to require a CLA (e.g. fixing a spelling
line by itself in your commit message body. mistake), place the text "CLA: trivial" on a line by itself separated by
an empty line from the rest of the commit message. It is not sufficient to
only place the text in the GitHub pull request description.
To amend a missing "CLA: trivial" line after submission, do the following:
git commit --amend
[add the line, save and quit the editor]
git push -f
2. All source files should start with the following text (with 2. All source files should start with the following text (with
appropriate comment characters at the start of each line and the appropriate comment characters at the start of each line and the