diff options
| author | Matt Caswell <matt@openssl.org> | 2016-06-03 10:42:20 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-06-03 17:10:16 +0100 |
| commit | 4d6013c762dcd8d1eb7d481b7d6df6b5433818fe (patch) | |
| tree | 7769422bc9d2c7248a2d3a29f0b377ca45dedf71 /CONTRIBUTING | |
| parent | 073b1b72f61d81f3cf8bc1728d35f9e7e734bbd2 (diff) | |
| download | openssl-new-4d6013c762dcd8d1eb7d481b7d6df6b5433818fe.tar.gz | |
Further update CONTRIBUTING
Tweak to the wording on merge commits.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'CONTRIBUTING')
| -rw-r--r-- | CONTRIBUTING | 4 |
1 files 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 |