From: Eli Zaretskii <eliz@gnu.org>
To: luangruo@yahoo.com
Cc: emacs-devel@gnu.org
Subject: Re: ChangeLog.4
Date: Wed, 17 May 2023 18:39:22 +0300 [thread overview]
Message-ID: <837ct7x905.fsf@gnu.org> (raw)
In-Reply-To: <83ttwbxkrm.fsf@gnu.org> (message from Eli Zaretskii on Wed, 17 May 2023 14:25:17 +0300)
> Date: Wed, 17 May 2023 14:25:17 +0300
> From: Eli Zaretskii <eliz@gnu.org>
> Cc: emacs-devel@gnu.org
>
> > From: Po Lu <luangruo@yahoo.com>
> > Date: Wed, 17 May 2023 16:39:08 +0800
> >
> > Every change after:
> >
> > 2022-04-04 Eli Zaretskii <eliz@gnu.org>
> >
> > * Version 28.1 released.
> >
> > appears to have been made on:
> >
> > 2023-04-15 Eli Zaretskii <eliz@gnu.org>
> > 2023-04-15 Po Lu <luangruo@yahoo.com>
> >
> > in ChangeLog.4. Would someone please look into this?
>
> Some kind of gitmerge snafu, it seems.
I figured out the reason: it's my fault. I have in my ~/.gitconfig
[merge "merge-changelog"]
name = GNU-style ChangeLog merge driver
driver = /usr/local/bin/git-merge-changelog %O %A %B
So this is the result of using git-merge-changelog, which is not TRT
when merging ChangeLog.4 from the release branch to master.
Sorry.
next prev parent reply other threads:[~2023-05-17 15:39 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <874job5p3n.fsf.ref@yahoo.com>
2023-05-17 8:39 ` ChangeLog.4 Po Lu
2023-05-17 8:41 ` ChangeLog.4 Po Lu
2023-05-17 11:25 ` ChangeLog.4 Eli Zaretskii
2023-05-17 15:39 ` Eli Zaretskii [this message]
2023-05-18 17:20 ` ChangeLog.4 Sean Whitton
2023-05-18 17:44 ` ChangeLog.4 Eli Zaretskii
2023-05-18 17:50 ` ChangeLog.4 Sean Whitton
2023-05-18 18:27 ` ChangeLog.4 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=837ct7x905.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=luangruo@yahoo.com \
/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).