On 05/23/2010 10:12 AM, Bruno Haible wrote: > Hi Ralf, > >> I only now became aware of the --split-merged-entry option which >> git-merge-changelog provides, because I never bothered to look at --help >> output > > Whereas I was aware of the option, but thought I would never need it, > and was then surprised to have conflicts in ChangeLog at each step while > rebasing a series of 30 patches.
It's nice that --split-merged-entry separates merged but unrelated entries to make the rebase succeed. But what about the converse - is there any demand for a filter that would 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? -- Eric Blake ebl...@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
