On Tue, May 26, 2020 at 12:27:59PM +0100, Richard Earnshaw wrote: > I haven't investigated in detail, but could we use a merge strategy with > the cherry-pick to drop ChangeLog entries?
If that works, sure. Note, when cherry-picking commits from before conversion to git or whenever people started to write usable ChangeLog entries in the commit messages, one will also need to reconstruct the commit message additions from the ChangeLog files. Jakub