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

Bug, git rebase -i does not abort correctly

From
Duy Nguyen <pclouds@gmail.com>
Date
Jan 25, 2018, 12:13 UTC
Message-ID
<CACsJy8Dzh5E8JUDkwFmYTwS6KgqGc_1rJBVsDCoC9EpcSShN2Q@mail.gmail.com>

rebase scripts are too much for me, so I'll play the user reporting bugs this time :)

Instead of doing
    $ git rebase -i --onto origin/master @~3
I sometimes accidentally type
    $ git rebase -i origin/master @~3
("rebase -i" is actually an alias, which is why I never forget to type -i)

Usually the todo list in $EDITOR shows noop, I realize my mistake and try to abort it by clearing the todo list before saving and closing $EDITOR. The problem is, HEAD is moved away anyway (to origin/master I think) even if rebase is supposed to abort the operation and leave HEAD untouched.

-- 
Duy
Next: Kaartic Sivaraam
Message 1 of 4 in “Bug, git rebase -i does not abort correctly”
  1. Duy NguyenJan 25, 2018
  2. Kaartic SivaraamJan 26, 2018
  3. Duy NguyenJan 26, 2018
  4. Kaartic SivaraamMar 13, 2018

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.