com php-src: Adjust Git-Rules: README.GIT-RULES

From: Date: Wed, 29 Jul 2015 08:02:39 +0000
Subject: com php-src: Adjust Git-Rules: README.GIT-RULES
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-88213@lists.php.net to get a copy of this message
Commit: 8f1baa6e1ceffb54529402e210e6397466e1049a Author: Julien Pauli <jpauli@php.net> Wed, 29 Jul 2015 10:02:39 +0200 Parents: 496f291f3dabd4a2b14cbe2669c87dd845c0b31b Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8f1baa6e1ceffb54529402e210e6397466e1049a Log: Adjust Git-Rules Changed paths: M README.GIT-RULES Diff: diff --git a/README.GIT-RULES b/README..GIT-RULES index 843c61e..c1c256d 100644 --- a/README.GIT-RULES +++ b/README.GIT-RULES @@ -12,7 +12,7 @@ Collaboration is a Good Thing(tm), and Git lets us do this. Thus, following some basic rules with regards to Git usage will:: a. Make everybody happier, especially those responsible for maintaining - Git itself. + PHP itself. b. Keep the changes consistently well documented and easily trackable. @@ -48,11 +48,11 @@ Currently we have the following branches in use:: 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. + PHP-5.5 Is used to release the PHP 5.5.x series. This is an old + stable version and is open for security fixes only. - PHP-5.4 Is used to release the PHP 5.4.x series. This is a current - stable version and is open for bugfixes only. + PHP-5.4 Is used to release the PHP 5.4.x series. This is an old + stable version and is open for security fixes only. PHP-5.3 This branch is closed. @@ -67,7 +67,7 @@ Currently we have the following branches in use:: 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 + 1. All changes should first go to the lowest branch (i.e. 5.6) and then get merged up to all other branches. If a change is not needed for later branches (i.e. fixes for features which where dropped from later branches) an empty merge should be done.

« previous php.cvs (#88213) next »