git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
* 2.24.1: git cherry-pick --edit fails
@ 2019-12-29 20:29 Steffen Nurpmeso
  0 siblings, 0 replies; only message in thread
From: Steffen Nurpmeso @ 2019-12-29 20:29 UTC (permalink / raw)
  To: git; +Cc: Steffen Nurpmeso

Hello again.

  P.S.: i can confirm the surroundings are fixed in 2.25.0-rc0!

Looking into the archives it could be addressed for upcoming
release already, please ignore then.  But with 2.24.1, if i do

  git cherry-pick --allow-empty --edit SHA1 SHA1...

i end up with

  [topic/anonymous-1 746c421c] include/mx: new-style headers: add forgotten struct forwards
   Date: Fri Aug 23 16:49:53 2019 +0200
   15 files changed, 43 insertions(+), 2 deletions(-)
  On branch topic/anonymous-1
  Cherry-pick currently in progress.

  nothing to commit, working tree clean
  The previous cherry-pick is now empty, possibly due to conflict resolution.
  If you wish to commit it anyway, use:

      git commit --allow-empty

  and then use:

      git cherry-pick --continue

  to resume cherry-picking the remaining commits.
  If you wish to skip this commit, use:

      git cherry-pick --skip

I.e., i edit the commit message, the commit message has been
modified and the valid is ok, but the above appears.


--steffen
|
|Der Kragenbaer,                The moon bear,
|der holt sich munter           he cheerfully and one by one
|einen nach dem anderen runter  wa.ks himself off
|(By Robert Gernhardt)

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2019-12-29 20:34 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-29 20:29 2.24.1: git cherry-pick --edit fails Steffen Nurpmeso

Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.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).