From f687ca65ea9f3416ccd617ef496ff8425de8f9f6 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Tue, 4 Mar 2008 15:13:25 -0700 Subject: [PATCH] Use git-merge-changelog when available. * .gitattributes: New file. * README-hacking: Document use of git-merge-changelog. Signed-off-by: Eric Blake --- .gitattributes | 1 + ChangeLog | 4 ++++ README-hacking | 5 ++++- 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..e8495d51 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +ChangeLog merge=merge-changelog diff --git a/ChangeLog b/ChangeLog index 8506a435..3ebb0059 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2008-03-04 Eric Blake + 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 61616fea..9e6cc8b9 100644 --- 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 -- 2.47.2