bug-gnu-emacs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#44384: 27.1; Bug in finder-commentary buffer


From: Eli Zaretskii
Subject: bug#44384: 27.1; Bug in finder-commentary buffer
Date: Sat, 07 Nov 2020 09:26:33 +0200

> Date: Fri, 6 Nov 2020 17:26:12 -0800
> Cc: 44384@debbugs.gnu.org, Robert Thorpe <rt@robertthorpeconsulting.com>
> 
> By popular request, I've cherry-picked the fix to the emacs-27 branch.

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.)

Perhaps you did exactly that, but in that case, please don't remove
the telltale "cherry-picked from SHA1" part of the log message
inserted by Git.





reply via email to

[Prev in Thread] Current Thread [Next in Thread]