Commit:    944e622821ebd8ab62bcb3513f6b9e7bcc998b04
Author:    David Soria Parra <>         Wed, 21 Mar 2012 12:38:43 
Parents:   fda25d97ffa4e623b824aa70f0ba98e9eba88ef7
Branches:  PHP-5.3 PHP-5.4 master


Always keep the NEWS file from the branch when merging

We usually don't want to touch the NEWS files when we merge and have the
news items not merged by git. Therefore we tell git to use the 'ours' strategy
for the NEWS file.

Changed paths:
  M  .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 9276652..d8ee5cb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -21,3 +21,4 @@ sapi/nsapi/nsapi.c              ident
 sapi/continuity/capi.c          ident
 Zend/RFCs/002.txt               ident
 Zend/RFCs/003.txt               ident
+NEWS                            merge=ours

PHP CVS Mailing List (
To unsubscribe, visit:

Reply via email to