Re: [Bug-wget] [PATCH] fix a few little dissonances

[Tim Ruehsen]

Am Monday 04 June 2012 schrieb Giuseppe Scrivano:
> I just would like to share a very interesting tool to deal with
> changelog's and git, git-merge-changelog.  Not that I am a fan of
> ChangeLog's but it is there so let's make our life easier.  It is part
> of gnulib:
> 
> http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob;f=lib/git-merge-cha
> ngelog.c

Thanks for the hint.

git-merge-changelog can also be found in wget's gnulib/modules directory.
I put this entry into wget/trunk/.git/config:
[merge "merge-changelog"]
        name = GNU-style ChangeLog merge driver
        driver = ../trunk/gnulib/modules/git-merge-changelog %O %A %B

At least the docs say, you have to create a .gitattributes within each 
directory containing a ChangeLog file.
$cat .gitattributes 
ChangeLog    merge=merge-changelog


BTW, for Debian+derivatives: It it part of the package 'gnulib', so you won't 
need a custom install, if you're gonna using git-merge-changelog with other 
projects as well.

> Cheers,
> Giuseppe

Regards, Tim