summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFerenc Kovacs <tyrael@php.net>2014-08-27 00:47:09 +0200
committerFerenc Kovacs <tyrael@php.net>2014-08-27 00:47:09 +0200
commit52f35b984c4a1cc6e1e951a9c1d777ceb20e5606 (patch)
tree1648863e9d336b26e4c41a56b73f5d0d26848325
parentbda1cc69468c44ada683cfa52350f8bf28a068ec (diff)
downloadphp-git-52f35b984c4a1cc6e1e951a9c1d777ceb20e5606.tar.gz
update the GIT-RULES with the 5.6 and the release branches
-rw-r--r--README.GIT-RULES6
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