Commit Graph

10 Commits

Author SHA1 Message Date
Lior Kaplan
842fde2827 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Enable $ replacement in exif, ldap, pdo_pgsql and tidy
  Update NEWS
2014-07-21 01:47:19 +03:00
Lior Kaplan
0678dc8d91 Enable $ replacement in exif, ldap, pdo_pgsql and tidy 2014-07-21 01:45:36 +03:00
Nikita Popov
9a56dce83f Use NEWS merge driver for UPGRADING and UPGRADING.INTERNALS 2013-03-23 18:26:11 +01:00
Xinchen Hui
d4f9bbfae2 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-11 16:00:00 +08:00
Xinchen Hui
e1180b4f1a Fixed bug #62795 (Zip extension version not defined) 2012-08-11 15:59:06 +08:00
Gustavo André dos Santos Lopes
112a476b68 Merge .gitattributes EOL commit from 5.3.
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.
2012-04-10 19:45:18 +01:00
Gustavo André dos Santos Lopes
1c8fccdf6d Disabled EOL conversions on certain tests 2012-04-10 19:41:07 +01:00
David Soria Parra
ca797ca31e Use the NEWS merge driver if available
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.
2012-03-21 18:11:41 +01:00
David Soria Parra
944e622821 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.
2012-03-21 12:38:43 +01:00
David Soria Parra
eb8812e58b Enable $Id$ expansion for files with the $Revision$ keyword
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$.
2012-03-20 17:49:42 +01:00