Use git-merge-changelog when available.

* .gitattributes: New file.
* README-hacking: Document use of git-merge-changelog.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/.gitattributes b/.gitattributes
new file mode 100644 (file)
index 0000000..e8495d5
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+ChangeLog merge=merge-changelog

diff --git a/ChangeLog b/ChangeLog
index 8506a4356f2e3af60649a05539b84c4c7cc38404..3ebb0059437d52535581d66db3de48afbba8bb4a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-03-04  Eric Blake  <ebb9@byu.net>
 
+       Use git-merge-changelog when available.
+       * .gitattributes: New file.
+       * README-hacking: Document use of git-merge-changelog.
+
        Work around cygwin bug.
        * tests/atlocal.in (unsupported_fs_chars): Avoid cygwin bug where
        "touch 't\'" creates regular file 't'.

diff --git a/README-hacking b/README-hacking
index 61616feafb0709d95607f96c8cdacb393c7a467c..9e6cc8b9af7fe88eae2ea0c051ed09048ca93d39 100644 (file)
--- a/README-hacking
+++ b/README-hacking
@@ -51,11 +51,14 @@ and the GIT master copy:
 
 should output no difference.
 
+You may find it useful to install the git-merge-changelog merge driver:
+http://git.sv.gnu.org/gitweb/?p=gnulib.git;a=blob;f=lib/git-merge-changelog.c
+
 Enjoy!
 
 -----
 
-Copyright (C) 2002-2007 Free Software Foundation, Inc.
+Copyright (C) 2002-2008 Free Software Foundation, Inc.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by