com php-src: Always keep the NEWS file from the branch when merging: .gitattributes

From: Date: Wed, 21 Mar 2012 11:38:43 +0000
Subject: com php-src: Always keep the NEWS file from the branch when merging: .gitattributes
Groups: php.cvs 
Request: Send a blank email to [email protected] to get a copy of this message 
Commit:    944e622821ebd8ab62bcb3513f6b9e7bcc998b04
Author:    David Soria Parra <[email protected]>         Wed, 21 Mar 2012 12:38:43 +0100
Parents:   fda25d97ffa4e623b824aa70f0ba98e9eba88ef7
Branches:  PHP-5.3 PHP-5.4 master

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

Log:
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:
944e622821ebd8ab62bcb3513f6b9e7bcc998b04
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

Thread (1 message)

  • David Soria Parra
« previous php.cvs (#68107) next »