Skip to content

Commit c25e97f

Browse files
carusogabrielkrakjoe
authored andcommitted
Update README.GIT-RULES
1 parent 47b90e9 commit c25e97f

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

Diff for: README.GIT-RULES

+10-7
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,20 @@ Having said that, here are the organizational rules::
4444

4545
Currently we have the following branches in use::
4646

47-
master The active development branch.
47+
master The active development branch.
4848

49-
PHP-7.1 Is used to release the PHP 7.1.x series. This is a prerelease
50-
version.
51-
52-
PHP-7.0 Is used to release the PHP 7.0.x series. This is a current
49+
PHP-7.2 Is used to release the PHP 7.2.x series. This is a current
5350
stable version and is open for bugfixes only.
5451

55-
PHP-5.6 Is used to release the PHP 5.6.x series. This is a current
52+
PHP-7.1 Is used to release the PHP 7.1.x series. This is a current
5653
stable version and is open for bugfixes only.
5754

55+
PHP-7.0 Is used to release the PHP 7.0.x series. This is an old
56+
stable version and is open for security fixes only.
57+
58+
PHP-5.6 Is used to release the PHP 5.6.x series. This is an old
59+
stable version and is open for security fixes only.
60+
5861
PHP-5.5 This branch is closed.
5962

6063
PHP-5.4 This branch is closed.
@@ -110,7 +113,7 @@ The format of the commit messages is pretty simple.
110113
An Example from the git project (commit 2b34e486bc):
111114

112115
pack-objects: Fix compilation with NO_PTHREDS
113-
116+
114117
It looks like commit 99fb6e04 (pack-objects: convert to use
115118
parse_options(), 2012-02-01) moved the #ifdef NO_PTHREDS around but
116119
hasn't noticed that the 'arg' variable no longer is available.

0 commit comments

Comments
 (0)