From 4d6013c762dcd8d1eb7d481b7d6df6b5433818fe Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Fri, 3 Jun 2016 10:42:20 +0100 Subject: [PATCH 1/1] Further update CONTRIBUTING Tweak to the wording on merge commits. Reviewed-by: Rich Salz Reviewed-by: Richard Levitte --- CONTRIBUTING | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING b/CONTRIBUTING index d826e8805f..c60596ebbe 100644 --- a/CONTRIBUTING +++ b/CONTRIBUTING @@ -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 -- 2.34.1