From: Stephen Berman <stephen.berman@gmx.net>
To: Eli Zaretskii <eliz@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: master fe7d2bb62fb 4/5: ; Merge from origin/emacs-29
Date: Sat, 13 Jan 2024 18:12:28 +0100 [thread overview]
Message-ID: <87r0ilcg3n.fsf@gmx.net> (raw)
In-Reply-To: <831qalgoe3.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 13 Jan 2024 18:59:48 +0200")
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
next prev parent reply other threads:[~2024-01-13 17:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <170514226115.19096.4951628921236684038@vcs2.savannah.gnu.org>
[not found] ` <20240113103754.667A6C00227@vcs2.savannah.gnu.org>
2024-01-13 16:39 ` master fe7d2bb62fb 4/5: ; Merge from origin/emacs-29 Stephen Berman
2024-01-13 16:59 ` Eli Zaretskii
2024-01-13 17:12 ` Stephen Berman [this message]
2024-01-13 17:32 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87r0ilcg3n.fsf@gmx.net \
--to=stephen.berman@gmx.net \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).