Make ChangeLog merges easier.

* .gitattributes: New file.
* HACKING: Mention how it helps.

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 04d364a22831478a050d370f4380252487f19d59..268e36925df974a581c9ed3972f5f17c68cf4048 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-16  Eric Blake  <ebb9@byu.net>
+
+       Make ChangeLog merges easier.
+       * .gitattributes: New file.
+       * HACKING: Mention how it helps.
+
 2008-04-15  Peter O'Gorman  <peter@pogma.com>
 
        Allow bootstrap from git repository.

diff --git a/HACKING b/HACKING
index da95e7e0a0d77180aea8f869a5b1080e2565db29..778eab1cb33fe9b56842873fed78d7f41fa9fcb9 100644 (file)
--- a/HACKING
+++ b/HACKING
@@ -191,6 +191,8 @@ yyyy-mm-dd  Name of Author  <email@address>  (tiny change)
        * NEWS: Updated.
        Reported by Bob Friesenhahn <bfriesen@simple.dallas.tx.us>.
 
+* 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
 
 6. Editing `.am' Files
 ======================