diff options
| author | Stanislav Malyshev <stas@php.net> | 2018-07-31 22:40:21 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2018-07-31 22:41:11 -0700 |
| commit | 3ea095ab00c6106755590ccd659e6e0de3e53a00 (patch) | |
| tree | 0b115cb5e3eb66644b2f7f2ff8ea62aef8507ab9 /README.GIT-RULES | |
| parent | 65167f1c7d5a087022270b8b8fe10a3b0c58b3a0 (diff) | |
| download | php-git-3ea095ab00c6106755590ccd659e6e0de3e53a00.tar.gz | |
[ci skip] Typo
Diffstat (limited to 'README.GIT-RULES')
| -rw-r--r-- | README.GIT-RULES | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/README.GIT-RULES b/README.GIT-RULES index a2dfb6aeab..e4a04ff9ab 100644 --- a/README.GIT-RULES +++ b/README.GIT-RULES @@ -82,7 +82,7 @@ The next few rules are more of a technical nature:: 1. All non-security bugfix changes should first go to the lowest bugfix branch (i.e. 7.1) and then get merged up to all other branches. All security fixes should go to the lowest security fixes branch (i.e 5.6). - If a change is not needed for ater branches (i.e. fixes for features + If a change is not needed for later branches (i.e. fixes for features which were dropped from later branches) an empty merge should be done. 2. All news updates intended for public viewing, such as new features, |