emacs-devel
[Top][All Lists]
Advanced

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

Re: master fe7d2bb62fb 4/5: ; Merge from origin/emacs-29


From: Stephen Berman
Subject: Re: master fe7d2bb62fb 4/5: ; Merge from origin/emacs-29
Date: Sat, 13 Jan 2024 18:12:28 +0100
User-agent: Gnus/5.13 (Gnus v5.13)

On Sat, 13 Jan 2024 18:59:48 +0200 Eli Zaretskii <eliz@gnu.org> wrote:

>> From: Stephen Berman <stephen.berman@gmx.net>
>> Cc: Eli Zaretskii <eliz@gnu.org>
>> Date: Sat, 13 Jan 2024 17:39:23 +0100
>>
>> On Sat, 13 Jan 2024 05:37:54 -0500 (EST) Eli Zaretskii <eliz@gnu.org> wrote:
>>
>> > branch: master
>> > commit fe7d2bb62fb4a618362ffa787ed1d1a3bda4a4dd
>> > Merge: f1736571fa3 26eb9d3a8a6
>> > Author: Eli Zaretskii <eliz@gnu.org>
>> > Commit: Eli Zaretskii <eliz@gnu.org>
>> >
>> >     ; Merge from origin/emacs-29
>> >
>> >     The following commit was skipped:
>> >
>> >     26eb9d3a8a6 Fix typo in lispref "Creating Strings" section
>>
>> Because of this, the typo stills exists on master.  Is this due to my
>> having mistakenly committed the change to master and then reverting it
>> and committing it to emacs-29?
>
> I guess so, yes.

I wonder how this happened; I didn't mark the commit for skipping as per
gitmerge.el.

>> Does it now have to be manually installed to master as well?
>
> Yes, please.

Done.

Steve Berman



reply via email to

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