Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Aug 11, 2012

  1. Xinchen Hui

    Merge branch 'PHP-5.3' into PHP-5.4

    laruence authored
  2. Xinchen Hui

    Fixed bug #62795 (Zip extension version not defined)

    laruence authored

Apr 10, 2012

  1. Gustavo Lopes

    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.
    cataphract authored
  2. Gustavo Lopes

    Disabled EOL conversions on certain tests

    cataphract authored

Mar 21, 2012

  1. 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 merge it.  This commit sets the default merge driver for the NEWS
    file to the merge driver called NEWS.
    dsp authored
  2. 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 the 'ours' strategy
    for the NEWS file.
    dsp authored

Mar 20, 2012

  1. 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 only for files that use
    $Revision$.
    dsp authored
Something went wrong with that request. Please try again.