git/list[1] front-page[2] threads[3] people[4] search[5] about
 

rebase / am separation problem

From
Michal Suchánek <msuchanek@suse.de>
Date
Jun 10, 2019, 15:07 UTC
Message-ID
<20190610170718.2f9fe177@naga.suse.cz>
Hello,
there is an issue with rebase vs am separation.
I am using git 2.20.1 and just observed this behavior:
 - rebase started ( possibly with previous am in progress on 
   different branch - not known)
 - rebase stopped, used am --skip to continue
 - renase was not able to finish
Does anybody else observe this issue?

There is some nesting possible - I am sure that at least one of cherry-pick and am can be included on top of a commit where git stopped during rebase -i. However, git should either isolate the three properly so they can be layered one on top of another of reject the command if it would corrupt state of currently running command.

Thanks
Michal
Next: Johannes Schindelin
Message 1 of 2 in “rebase / am separation problem”
  1. Michal SuchánekJun 10, 2019
  2. Johannes SchindelinJun 10, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.