Further update CONTRIBUTING
authorMatt Caswell <matt@openssl.org>
Fri, 3 Jun 2016 09:42:20 +0000 (10:42 +0100)
committerMatt Caswell <matt@openssl.org>
Fri, 3 Jun 2016 16:10:16 +0000 (17:10 +0100)
Tweak to the wording on merge commits.

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
CONTRIBUTING

index d826e8805f5542b06f146cbdf34758d0bfc4394f..c60596ebbeb6654ee8471f58bfe32b336b8d9400 100644 (file)
@@ -57,8 +57,8 @@ the acceptance and review process faster:
 
     3.  Patches should be as current as possible.  When using GitHub, please
     expect to have to rebase and update often. Note that we do not accept merge
-    commits, so please avoid these in any pull request. You will be asked to
-    remove them before a patch is considered acceptable.
+    commits. You will be asked to remove them before a patch is considered
+    acceptable.
 
     4.  Patches should follow our coding style (see
     https://www.openssl.org/policies/codingstyle.html) and compile without