From: "Mattias Engdegård" <mattiase@acm.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 42296@debbugs.gnu.org
Subject: bug#42296: 27.0.91; Correct manual entry for 'concat' w.r.t. allocation [PATCH]
Date: Sat, 11 Jul 2020 15:47:05 +0200 [thread overview]
Message-ID: <F827EA78-5155-4940-988E-9ED10E40174A@acm.org> (raw)
In-Reply-To: <83h7uenpf6.fsf@gnu.org>
11 juli 2020 kl. 15.37 skrev Eli Zaretskii <eliz@gnu.org>:
> Next time you have to do something like this, use "git cherry-pick -x"
> to bring commits from master to the release branch, since that helps
> merging in the opposite direction (I think the way you did it might
> cause merge conflicts).
Understood.
next prev parent reply other threads:[~2020-07-11 13:47 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-09 15:54 bug#42296: 27.0.91; Correct manual entry for 'concat' w.r.t. allocation [PATCH] Mattias Engdegård
2020-07-09 17:31 ` Eli Zaretskii
2020-07-09 17:56 ` Mattias Engdegård
2020-07-09 18:51 ` Eli Zaretskii
2020-07-09 19:17 ` Mattias Engdegård
2020-07-09 19:24 ` Eli Zaretskii
2020-07-10 17:04 ` Mattias Engdegård
2020-07-10 18:08 ` Eli Zaretskii
2020-07-11 11:15 ` Mattias Engdegård
2020-07-11 11:52 ` Eli Zaretskii
2020-07-11 12:51 ` Mattias Engdegård
2020-07-11 13:07 ` Eli Zaretskii
2020-07-11 13:16 ` Mattias Engdegård
2020-07-11 13:37 ` Eli Zaretskii
2020-07-11 13:47 ` Mattias Engdegård [this message]
2020-07-11 16:17 ` Drew Adams
2020-07-12 3:03 ` Richard Stallman
2020-07-09 19:20 ` 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=F827EA78-5155-4940-988E-9ED10E40174A@acm.org \
--to=mattiase@acm.org \
--cc=42296@debbugs.gnu.org \
--cc=eliz@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).