[SCM] GNU Libtool branch, master, updated. 4f1c4fc7d4825368d526d51579fbbd807826d9c1

[Eric Blake]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".

The branch, master has been updated
       via  4f1c4fc7d4825368d526d51579fbbd807826d9c1 (commit)
      from  85953e3b87e76d2af6e98e80f65c428bd91d01ea (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4f1c4fc7d4825368d526d51579fbbd807826d9c1
Author: Eric Blake <address@hidden>
Date:   Wed Apr 16 14:52:35 2008 -0600

    Make ChangeLog merges easier.
    
    * .gitattributes: New file.
    * HACKING: Mention how it helps.
    
    Signed-off-by: Eric Blake <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 .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
 ======================


hooks/post-receive
--
GNU Libtool