document and support usage of git-merge-changelog

2008-07-31  Paolo Bonzini  <bonzini@gnu.org>

	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.

diff --git a/ChangeLog b/ChangeLog
index 48d80a9bc9a8a6bc8efa67978cd482c1b78fd682..5727a03c42fd68b2a10ab0e21841b7686fcb9717 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-31  Paolo Bonzini  <bonzini@gnu.org>
+
+       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.
+
 2008-07-27  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        Remove remaining dependence on CVS Id keyword.

diff --git a/HACKING b/HACKING
index fc135e209cbe61da54a6cef9af1b8e41dbd56546..c2a790e070dc25f3a5bed1ee89a22e0ca7c9d12e 100644 (file)
--- a/HACKING
+++ b/HACKING
@@ -25,6 +25,10 @@ The correct response to most actual bugs is to write a new test case
 which demonstrates the bug.  Then fix the bug, re-run the test suite,
 and check everything in.
 
+** You may find it useful to install the git-merge-changelog merge driver.
+See http://www.mail-archive.com/bug-gnulib@gnu.org/msg09699.html for
+information on how to install it.
+
 
 * Hacking
 

diff --git a/bootstrap b/bootstrap
index 67063b5bfd000bd09626d9cb672fbc771d0171b1..c3c7748b9110f577187f80f2823c92ec3eaad000 100755 (executable)
--- 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