From: tumashu <tumashu@163.com>
To: 70456@debbugs.gnu.org
Subject: bug#70456: Request for merging "core-updates" branch
Date: Fri, 26 Apr 2024 22:44:26 +0800 (CST) [thread overview]
Message-ID: <24c1b4b1.25ee.18f1add5df8.Coremail.tumashu@163.com> (raw)
In-Reply-To: <ZiE0qcjXe5H_3XLT@dragon2>
[-- Attachment #1: Type: text/plain, Size: 315 bytes --]
emacs has a script gitmerge.el, it can skip some commit when merge with different merge rule (ours), maybe can make life easier:
https://git.savannah.gnu.org/cgit/emacs.git/tree/admin/gitmerge.el
https://git.savannah.gnu.org/cgit/emacs.git/tree/admin/notes/git-workflow
--
发自我的网易邮箱手机智能版
[-- Attachment #2: Type: text/html, Size: 436 bytes --]
next prev parent reply other threads:[~2024-04-26 15:17 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-18 14:56 bug#70456: Request for merging core-updates branch Steve George
2024-04-19 14:42 ` bug#70456: Request for merging "core-updates" branch Christopher Baines
2024-04-19 17:00 ` Christopher Baines
2024-04-20 16:16 ` Maxim Cournoyer
2024-04-20 18:08 ` Christopher Baines
2024-04-22 17:31 ` Maxim Cournoyer
2024-04-26 14:44 ` tumashu [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-03-24 11:21 Status of ‘core-updates’ Ludovic Courtès
2024-04-20 11:14 ` Christopher Baines
2024-05-02 7:53 ` bug#70456: Request for merging "core-updates" branch Ludovic Courtès
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=24c1b4b1.25ee.18f1add5df8.Coremail.tumashu@163.com \
--to=tumashu@163.com \
--cc=70456@debbugs.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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.