From e955edcda6a567369e55ac5e33fb90a2d4ad39b0 Mon Sep 17 00:00:00 2001 From: Pauli Date: Thu, 27 Jun 2019 18:45:26 +1000 Subject: [PATCH] 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 (Merged from https://github.com/openssl/openssl/pull/9265) --- CONTRIBUTING | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING b/CONTRIBUTING index 250bbdbf24..b65463c030 100644 --- a/CONTRIBUTING +++ b/CONTRIBUTING @@ -19,8 +19,16 @@ guidelines: 1. Anything other than a trivial contribution requires a Contributor License Agreement (CLA), giving us permission to use your code. See https://www.openssl.org/policies/cla.html for details. If your - contribution is too small to require a CLA, put "CLA: trivial" on a - line by itself in your commit message body. + contribution is too small to require a CLA (e.g. fixing a spelling + 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 appropriate comment characters at the start of each line and the -- 2.25.1