Re: [PATCH] Supporting git-merge-changelog

[Akim Demaille]

>>> "DJE" == Denny Joel E <address@hidden> writes:

 >> My final argument in favor of keeping the ChangeLog is Bruno's git-merge-
 >> changelog script.

 > Akim, I'm leaning toward keeping ChangeLog for now.  If you find
 > that git-merge-changelog does not solve the difficulties with
 > merging, perhaps we can revisit the issue again later.  Does that
 > sound reasonable?

Good with me.  It means I have to SMOP a few tools to generate
ChangeLog from git log when pushing, but I can afford that :(