Lines Matching refs:changelog
227 # See if we can use gnulib's git-merge-changelog merge driver.
229 if git config merge.merge-changelog.driver >/dev/null ; then
231 elif (git-merge-changelog --version) >/dev/null 2>/dev/null ; then
232 echo "initializing git-merge-changelog driver"
233 git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver'
234 git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B'
236 echo "consider installing git-merge-changelog from gnulib"
546 --no-changelog\
