diff options
| author | Michael Wallner <mike@php.net> | 2013-12-19 10:08:06 +0100 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2013-12-19 10:08:06 +0100 |
| commit | 391fe528b71a20e16c0eae08bd99fa8f95ce00b6 (patch) | |
| tree | 3066053cc5fbd8173b6ee6174486e59fa9a8939c | |
| parent | 16e95d91378591042c1bf4bd40dead3ef9ae975a (diff) | |
| parent | 3624a9ca7a8405f1e3983a34b495d8bb57d9b708 (diff) | |
| download | php-git-391fe528b71a20e16c0eae08bd99fa8f95ce00b6.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Update NEWS handling section of README.GIT-RULES
| -rw-r--r-- | README.GIT-RULES | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/README.GIT-RULES b/README.GIT-RULES index 6e90aa97b6..3df9d17bcd 100644 --- a/README.GIT-RULES +++ b/README.GIT-RULES @@ -69,9 +69,11 @@ The next few rules are more of a technical nature:: branches) an empty merge should be done. 2. All news updates intended for public viewing, such as new features, - bug fixes, improvements, etc., should go into the NEWS file of the - *first* to be released version with the given change. In other words - any NEWS file change only needs to done in one branch. + bug fixes, improvements, etc., should go into the NEWS file of *any + stable release* version with the given change. In other words, + news about a bug fix which went into PHP-5.4, PHP-5.5 and master + should be noted in both PHP-5.4/NEWS and PHP-5.5/NEWS but + not master, which is not a public released version yet. 3. Do not commit multiple file and dump all messages in one commit. If you modified several unrelated files, commit each group separately and |