[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Freeze is almost here

From: David Engster
Subject: Re: Freeze is almost here
Date: Sat, 14 Nov 2015 13:54:02 +0100
User-agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/24.5 (gnu/linux)

Eli Zaretskii writes:
>> From: David Engster <address@hidden>
>> Cc: Andreas Schwab <address@hidden>, address@hidden,
>> address@hidden
>> Date: Sat, 14 Nov 2015 09:45:10 +0100

>> Regarding your 'Backport' messages in the cherry-picks: You only need to
>> do that when there was a conflict. Otherwise, gitmerge.el should detect
>> cherry-picks through the cherry-mark and automatically mark them as to
>> be skipped. However, I realize now that I'm calling the wrong log
>> command for that; I'll fix that over the weekend.
> Thanks.
> Please also consider whether we need some changes in gitmerge.el now
> that we produce ChangeLog from the Git log.

I see now that master was merged into emacs-25. Is this now the new
workflow? If so, there's not much point in keeping gitmerge.el anyway.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]