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

[BUG] interactive rebase loses instruction sheet when aborting to avoid overwriting files

From
Yydirson@free.fr <ydirson@free.fr>
Date
Dec 19, 2014, 09:42 UTC
Message-ID
<1075489045.367270447.1418982175581.JavaMail.root@zimbra39-e7.priv.proxad.net>
In-Reply-To
<1009315412.367253372.1418981868176.JavaMail.root@zimbra39-e7.priv.proxad.net>
[using v2.1.3]

When using "rebase -i" and the working dir contains untracked files that are present in the new base, we correctly get a "would be overwritten by checkout" error, but then the whole rebase interrupts the (long) listing of the incriminated files in the middle of a line and terminates with:

Aborting could not detach HEAD

And consequently we are not rebasing any more, and the precious instruction sheet has been lost.

Message 1 of 1 in “[BUG] interactive rebase loses instruction sheet when aborting to avoid overwriting files”
  1. ydirson@free.frDec 19, 2014

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.