Skip to content
Commits on Aug 11, 2012
  1. @laruence
  2. @laruence
Commits on Apr 10, 2012
  1. @cataphract

    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 committed Apr 10, 2012
  2. @cataphract
Commits on Mar 21, 2012
  1. @dsp

    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 committed Mar 21, 2012
  2. @dsp

    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 committed Mar 21, 2012
Commits on Mar 20, 2012
  1. @dsp

    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 committed Mar 20, 2012
Something went wrong with that request. Please try again.