From fee2ed87aa5f0c2a1cefbe4056300e8a28794e39 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 31 Jul 2008 11:00:58 +0200 Subject: document and support usage of git-merge-changelog 2008-07-31 Paolo Bonzini Support usage of git-merge-changelog. * .gitattributes: New. * HACKING: Document usage of git-merge-changelog. * bootstrap: Install git-merge-changelog entries in .git/config if appropriate. --- bootstrap | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'bootstrap') diff --git a/bootstrap b/bootstrap index 67063b5b..c3c7748b 100755 --- a/bootstrap +++ b/bootstrap @@ -267,6 +267,20 @@ cleanup_gnulib() { exit $status } +# See if we can use gnulib's git-merge-changelog merge driver. + +if test -d .git && (git --version) >/dev/null 2>/dev/null ; then + if git config merge.merge-changelog.driver >/dev/null ; then + : + elif (git-merge-changelog --version) >/dev/null 2>/dev/null ; then + echo "initializing git-merge-changelog driver" + git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver' + git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B' + else + echo "consider installing git-merge-changelog from gnulib" + fi +fi + # Get gnulib files. case ${GNULIB_SRCDIR--} in -- cgit v1.2.1