[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-cvs
Subject:    [PHP-CVS] com php-src: [ci skip] Ugh, whitespace: README.GIT-RULES
From:       Stanislav Malyshev <stas () php ! net>
Date:       2018-07-31 19:44:51
Message-ID: php-mail-dd838ec71feee72941fccbb7e10d71f9492459429 () git ! php ! net
[Download RAW message or body]

Commit:    65167f1c7d5a087022270b8b8fe10a3b0c58b3a0
Author:    Stanislav Malyshev <stas@php.net>         Tue, 31 Jul 2018 12:44:51 -0700
Parents:   201022c34791318034f37591d00a39fc00577654
Branches:  master

Link:       http://git.php.net/?p=php-src.git;a=commitdiff;h=65167f1c7d5a087022270b8b8fe10a3b0c58b3a0

Log:
[ci skip] Ugh, whitespace

Changed paths:
  M  README.GIT-RULES


Diff:
diff --git a/README.GIT-RULES b/README.GIT-RULES
index 591b56b..a2dfb6a 100644
--- a/README.GIT-RULES
+++ b/README.GIT-RULES
@@ -79,10 +79,10 @@ Currently we have the following branches in use::
 
 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 
+   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
       which were dropped from later branches) an empty merge should be done.
 
    2. All news updates intended for public viewing, such as new features,


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[prev in list] [next in list] [prev in thread] [next in thread]