delta/php-git.git/.gitattributes, branch immutable-date git.php.net: repository/php-src.git Merge branch 'PHP-5.3' into PHP-5.4 2012-08-11T08:00:00+00:00 Xinchen Hui laruence@php.net 2012-08-11T08:00:00+00:00 d4f9bbfae248687c1aa68370564b14544eb4eafd 






Fixed bug #62795 (Zip extension version not defined)
2012-08-11T07:59:06+00:00

Xinchen Hui
laruence@php.net

2012-08-11T07:59:06+00:00

e1180b4f1aea83ee5dc7f62832a10056e0f62f18












Merge .gitattributes EOL commit from 5.3.
2012-04-10T18:45:18+00:00

Gustavo André dos Santos Lopes
cataphract@php.net

2012-04-10T18:41:33+00:00

112a476b683a634390b23fe7509d5b73632d0829

This merge commit includes several changes from the 5.3 commit.
This is because of 1) different tests between the two branches
and 2) the svn:eol-style attributes differing between the two
branches.





This merge commit includes several changes from the 5.3 commit.
This is because of 1) different tests between the two branches
and 2) the svn:eol-style attributes differing between the two
branches.







Disabled EOL conversions on certain tests
2012-04-10T18:41:07+00:00

Gustavo André dos Santos Lopes
cataphract@php.net

2012-04-10T18:41:07+00:00

1c8fccdf6d6d04d8e6a5dedd7c9d6b1afda8839f












Use the NEWS merge driver if available
2012-03-21T17:11:41+00:00

David Soria Parra
dsp@php.net

2012-03-21T17:07:30+00:00

ca797ca31ecae10f705789fbf870a6f02e8b5f17

As described in https://wiki.php.net/vcs/gitworkflow#the_news_file it
is possible to setup a custom merge driver for NEWS so git doesnt try
to merge it.  This commit sets the default merge driver for the NEWS
file to the merge driver called NEWS.





As described in https://wiki.php.net/vcs/gitworkflow#the_news_file it
is possible to setup a custom merge driver for NEWS so git doesnt try
to merge it.  This commit sets the default merge driver for the NEWS
file to the merge driver called NEWS.







Always keep the NEWS file from the branch when merging
2012-03-21T11:38:43+00:00

David Soria Parra
dsp@php.net

2012-03-21T11:38:43+00:00

944e622821ebd8ab62bcb3513f6b9e7bcc998b04

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.





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.







Enable $Id$ expansion for files with the $Revision$ keyword
2012-03-20T16:49:42+00:00

David Soria Parra
dsp@php.net

2012-03-20T16:49:42+00:00

eb8812e58b5376361163d733ff40c1bc52f21090

Git supports a limited $Id$ keyword expansion. This $Id$ tag is similar to
$Revision$ in SVN. We enable the $Id$ expansion only for files that use
$Revision$.





Git supports a limited $Id$ keyword expansion. This $Id$ tag is similar to
$Revision$ in SVN. We enable the $Id$ expansion only for files that use
$Revision$.