diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-08-27 00:47:37 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-08-27 00:47:37 +0200 |
| commit | 1e1b7c74fb8b68aacb3948c2c499917397f82d29 (patch) | |
| tree | a43f2432649f1e4911e5739a0035ca625351c9f3 | |
| parent | f463523cdade48b741668ae2e80c866b4e3e753e (diff) | |
| parent | 52f35b984c4a1cc6e1e951a9c1d777ceb20e5606 (diff) | |
| download | php-git-1e1b7c74fb8b68aacb3948c2c499917397f82d29.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
update the GIT-RULES with the 5.6 and the release branches
| -rw-r--r-- | README.GIT-RULES | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/README.GIT-RULES b/README.GIT-RULES index d966093f25..843c61ea63 100644 --- a/README.GIT-RULES +++ b/README.GIT-RULES @@ -45,6 +45,9 @@ Currently we have the following branches in use:: master The active development branch. + PHP-5.6 Is used to release the PHP 5.6.x series. This is a current + stable version and is open for bugfixes only. + PHP-5.5 Is used to release the PHP 5.5.x series. This is a current stable version and is open for bugfixes only. @@ -59,6 +62,9 @@ Currently we have the following branches in use:: PHP-4.4 This branch is closed. + PHP-X.Y.Z These branches are used for the release managers for tagging + the releases, hence they are closed to the general public. + The next few rules are more of a technical nature:: 1. All changes should first go to the lowest branch (i.e. 5.4) and then |