Skip to content

Commit 4ae4b7b

Browse files
committed
Merge branch 'PHP-5.6' of http://git.php.net/repository/php-src into PHP-5.6
2 parents cee72c1 + 5ce843a commit 4ae4b7b

File tree

4 files changed

+387
-365
lines changed

4 files changed

+387
-365
lines changed

README.GIT-RULES

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,11 @@ The next few rules are more of a technical nature::
6969
branches) an empty merge should be done.
7070

7171
2. All news updates intended for public viewing, such as new features,
72-
bug fixes, improvements, etc., should go into the NEWS file of the
73-
*first* to be released version with the given change. In other words
74-
any NEWS file change only needs to done in one branch.
72+
bug fixes, improvements, etc., should go into the NEWS file of *any
73+
stable release* version with the given change. In other words,
74+
news about a bug fix which went into PHP-5.4, PHP-5.5 and master
75+
should be noted in both PHP-5.4/NEWS and PHP-5.5/NEWS but
76+
not master, which is not a public released version yet.
7577

7678
3. Do not commit multiple file and dump all messages in one commit. If you
7779
modified several unrelated files, commit each group separately and

0 commit comments

Comments
 (0)