delta/php-git.git - git.php.net: repository/php-src.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Use NEWS merge driver for UPGRADING and UPGRADING.INTERNALS	Nikita Popov	2013-03-23	1	-0/+2
\|
*	Merge branch 'PHP-5.3' into PHP-5.4	Xinchen Hui	2012-08-11	1	-0/+1
\|\
\| *	Fixed bug #62795 (Zip extension version not defined)	Xinchen Hui	2012-08-11	1	-0/+1
\| \|
* \|	Merge .gitattributes EOL commit from 5.3.	Gustavo André dos Santos Lopes	2012-04-10	1	-0/+150
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \|	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	Gustavo André dos Santos Lopes	2012-04-10	1	-0/+149
\|/
*	Use the NEWS merge driver if available	David Soria Parra	2012-03-21	1	-1/+1
\| \| \| \| \| \| \|	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	David Soria Parra	2012-03-21	1	-0/+1
\| \| \| \| \| \|	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	David Soria Parra	2012-03-20	1	-0/+23
	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$.