I'm committing this; it makes merging changelog entries across git branches much easier, if you have installed Bruno's git-merge-changelog [1]; and is harmless if you haven't.
[1] http://git.sv.gnu.org/gitweb/?p=gnulib.git;a=blob;f=lib/git-merge- changelog.c From: Eric Blake <[EMAIL PROTECTED]> 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 <[EMAIL PROTECTED]> --- .gitattributes | 1 + ChangeLog | 4 ++++ README-hacking | 5 ++++- 3 files changed, 9 insertions(+), 1 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 8506a43..3ebb005 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2008-03-04 Eric Blake <[EMAIL PROTECTED]> + 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 61616fe..9e6cc8b 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 -- 1.5.4
