History log of /PHP-8.0/.gitattributes (Results 26 – 28 of 28)
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
Revision tags: php-5.3.11RC1, php-5.4.1RC1, PHP-5.4.1-RC1
# ca797ca3 21-Mar-2012 David Soria Parra

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

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.

show more ...


# 944e6228 21-Mar-2012 David Soria Parra

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

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.

show more ...


# eb8812e5 20-Mar-2012 David Soria Parra

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 onl

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$.

show more ...


12