[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: git-merge-changelog: mention --split-merged-entry in the header comm
From: |
Eric Blake |
Subject: |
Re: git-merge-changelog: mention --split-merged-entry in the header comment. |
Date: |
Mon, 24 May 2010 14:56:17 -0600 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.9) Gecko/20100430 Fedora/3.0.4-3.fc13 Lightning/1.0b1 Mnenhy/0.8.2 Thunderbird/3.0.4 |
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 address@hidden +1-801-349-2682
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature