[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 09:45:10 +0100
User-agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/24.5 (gnu/linux)

Eli Zaretskii writes:
>> From: Andreas Schwab <address@hidden>
>> Cc: address@hidden,  address@hidden
>> Date: Fri, 13 Nov 2015 22:34:50 +0100
>> Eli Zaretskii <address@hidden> writes:
>> > I see that you branched emacs-25 not from the latest master.  This
>> > means all the commits since 9463abf will have to be cherry-picked from
>> > master to the emacs-25 branch.
>> ??? Just fast forward it.
> I didn't know how to do that (can you tell?).

By merging master into emacs-25. Git will do a fast-forward by default
if it is possible (use --ff-only to abort otherwise).

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.


reply via email to

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