Hi Eric, > merge neighboring entries if > they share the same author and date, to get a rebased series to use the > same style as the original branch, so that the mere act of rebasing > doesn't break the author's style of merged entries?
I can imagine an option that would serve this purpose (for ChangeLog entries coming from the local user). But before adding more changes (even bug fixes) to git-merge-changelog, I think the next step - long overdue - would be to create a test suite for it. Simply a set of quadruples (O, A, B, result). Bruno
