ChangeLog's: do we have to?

Tom Tromey tom@tromey.com
Thu Jul 5 22:01:00 GMT 2018


>>>>> "Florian" == Florian Weimer <fw@deneb.enyo.de> writes:

Florian> To some degree, it's a bit of a chicken-and-egg problem because
Florian> “git am” tends to choke on ChangeLog patches (so we can't
Florian> really use it today)

FWIW, installing a ChangeLog merge driver fixes this.
I use git-merge-changelog from gnulib.  If you want to use git am and
avoid manually copying ChangeLog text from the commit message back into
the appropriate files, then it's much better to install the driver and
include the ChangeLog diffs in the patch submission.

Tom



More information about the Gcc mailing list