diff options
| author | David Soria Parra <dsp@php.net> | 2012-03-21 12:38:43 +0100 |
|---|---|---|
| committer | David Soria Parra <dsp@php.net> | 2012-03-21 12:38:43 +0100 |
| commit | 944e622821ebd8ab62bcb3513f6b9e7bcc998b04 (patch) | |
| tree | 130bd2670a8879f662803147a6d820a4dd12678d /.gitattributes | |
| parent | fda25d97ffa4e623b824aa70f0ba98e9eba88ef7 (diff) | |
| download | php-git-944e622821ebd8ab62bcb3513f6b9e7bcc998b04.tar.gz | |
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.
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 92766523d8..d8ee5cbbb3 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 |