[Top][All Lists]

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

Re: Freeze is almost here

From: Andreas Schwab
Subject: Re: Freeze is almost here
Date: Sat, 14 Nov 2015 09:16:40 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux)

Eli Zaretskii <address@hidden> 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?).

git merge

> In any case, by the time I got to that, someone already made one
> commit to the branch, so I think fast-forwarding would have been
> impossible.

No, there is no such commit.


Andreas Schwab, address@hidden
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

reply via email to

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