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

    Use the NEWS merge driver if available

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

    Always keep the NEWS file from the branch when merging

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

    Enable $Id$ expansion for files with the $Revision$ keyword

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