diff options
| author | Julien Pauli <jpauli@php.net> | 2015-07-29 10:04:08 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-07-29 10:04:08 +0200 |
| commit | 66edc158755a8e960499913f16f6455797bb5803 (patch) | |
| tree | 3e85723322d7d0b3b021f87e6856f6dfb07368cf | |
| parent | ce5c4500cd942ab85efa1e916ef00de860be9e6e (diff) | |
| parent | 8f1baa6e1ceffb54529402e210e6397466e1049a (diff) | |
| download | php-git-66edc158755a8e960499913f16f6455797bb5803.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Adjust Git-Rules
5.4.44 next
Conflicts:
configure.in
main/php_version.h
| -rw-r--r-- | README.GIT-RULES | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/README.GIT-RULES b/README.GIT-RULES index 843c61ea63..c1c256dcf1 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. |