From: Gabriel Caruso Date: Thu, 8 Feb 2018 13:03:49 +0000 (-0200) Subject: Update README.GIT-RULES X-Git-Tag: php-7.3.0alpha1~468^2~9 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c25e97fdabf0dde00ad1173308467c31bcefef21;p=php Update README.GIT-RULES --- diff --git a/README.GIT-RULES b/README.GIT-RULES index 6ee3585931..1a0c1aebae 100644 --- a/README.GIT-RULES +++ b/README.GIT-RULES @@ -44,17 +44,20 @@ Having said that, here are the organizational rules:: Currently we have the following branches in use:: - master The active development branch. + master The active development branch. - PHP-7.1 Is used to release the PHP 7.1.x series. This is a prerelease - version. - - PHP-7.0 Is used to release the PHP 7.0.x series. This is a current + PHP-7.2 Is used to release the PHP 7.2.x series. This is a current stable version and is open for bugfixes only. - PHP-5.6 Is used to release the PHP 5.6.x series. This is a current + PHP-7.1 Is used to release the PHP 7.1.x series. This is a current stable version and is open for bugfixes only. + PHP-7.0 Is used to release the PHP 7.0.x series. This is an old + stable version and is open for security fixes only. + + PHP-5.6 Is used to release the PHP 5.6.x series. This is an old + stable version and is open for security fixes only. + PHP-5.5 This branch is closed. PHP-5.4 This branch is closed. @@ -110,7 +113,7 @@ The format of the commit messages is pretty simple. An Example from the git project (commit 2b34e486bc): pack-objects: Fix compilation with NO_PTHREDS - + It looks like commit 99fb6e04 (pack-objects: convert to use parse_options(), 2012-02-01) moved the #ifdef NO_PTHREDS around but hasn't noticed that the 'arg' variable no longer is available.