git ChangeLog merge driver

[Eric Blake]

I've found this so useful on autoconf, when managing multiple topic branches 
with ChangeLog entries, that I'd like to commit it in libtool.  It's 
particularly important if you use 'git config branch.master.rebase true' and 
check in ChangeLog entries as you go.  Any objections?  The embedded link is to 
the gnulib git repository, and includes instructions on how to install the git-
merge-changelog driver; git gracefully falls back on its default merge driver 
if you don't have the git-merge-changelog driver installed (although graceful 
can be argued, since you are more likely to have to deal with merge conflicts).


>From 4f1c4fc7d4825368d526d51579fbbd807826d9c1 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Wed, 16 Apr 2008 14:52:35 -0600
Subject: [PATCH] Make ChangeLog merges easier.

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

Signed-off-by: Eric Blake <address@hidden>
---
 .gitattributes |    1 +
 ChangeLog      |    6 ++++++
 HACKING        |    2 ++
 3 files changed, 9 insertions(+), 0 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..e8495d5
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+ChangeLog merge=merge-changelog
diff --git a/ChangeLog b/ChangeLog
index 04d364a..268e369 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-16  Eric Blake  <address@hidden>
+
+       Make ChangeLog merges easier.
+       * .gitattributes: New file.
+       * HACKING: Mention how it helps.
+
 2008-04-15  Peter O'Gorman  <address@hidden>
 
        Allow bootstrap from git repository.
diff --git a/HACKING b/HACKING
index da95e7e..778eab1 100644
--- a/HACKING
+++ b/HACKING
@@ -191,6 +191,8 @@ yyyy-mm-dd  Name of Author  <address@hidden>  (tiny change)
        * NEWS: Updated.
        Reported by Bob Friesenhahn <address@hidden>.
 
+* 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
 ======================
-- 
1.5.5