unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Stefan Kangas <stefan@marxist.se>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 44384@debbugs.gnu.org, stephen.berman@gmx.net,
	rt@robertthorpeconsulting.com
Subject: bug#44384: 27.1; Bug in finder-commentary buffer
Date: Fri, 6 Nov 2020 23:57:28 -0800	[thread overview]
Message-ID: <CADwFkmnp-rX9CdqLfNCV7ygRW1fEWaC9Y0j=POZBUf4j91QOHg@mail.gmail.com> (raw)
In-Reply-To: <83y2jd7hli.fsf@gnu.org>

Eli Zaretskii <eliz@gnu.org> writes:

> Thanks, but a better, less error-prone, way of cherry-picking from
> master is this:
>
>   git cherry-pick -xe SHA1
>   <edit the log message>
>   git push
>
> This is better because the -x switch automatically generates a log
> message saying it was cherry-picked from a specific commitm and
> git-merge.el will not merge such commits, so you don't have to
> remember saying "do not merge" in the log message.  (And having
> "backport" in the log message also disables merging.)

Thank you, I will note that down for next time.





      reply	other threads:[~2020-11-07  7:57 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-02  4:13 bug#44384: 27.1; Bug in finder-commentary buffer Robert Thorpe
2020-11-02  9:41 ` Stephen Berman
     [not found]   ` <CADwFkm=xp5yNa7SaKVWFSwxUg94y8O0himgzMBtww_E=+XkNUg@mail.gmail.com>
2020-11-07  1:26     ` Stefan Kangas
2020-11-07  7:26       ` Eli Zaretskii
2020-11-07  7:57         ` Stefan Kangas [this message]

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='CADwFkmnp-rX9CdqLfNCV7ygRW1fEWaC9Y0j=POZBUf4j91QOHg@mail.gmail.com' \
    --to=stefan@marxist.se \
    --cc=44384@debbugs.gnu.org \
    --cc=eliz@gnu.org \
    --cc=rt@robertthorpeconsulting.com \
    --cc=stephen.berman@gmx.net \
    /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).