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

Re: [BUG?] rebase -i: edit versus unmerged changes

From
Ramkumar Ramachandra <artagnon@gmail.com>
Date
Mar 20, 2013, 20:25 UTC
Message-ID
<CALkWK0mgX40oicqxnoa7M3NJP_k8jDrg7mVGyWrg5T+=iRtHQA@mail.gmail.com>
In-Reply-To
<CADeaMWoeRQBbrqLsfieKTE2rRbpzU-Hyp+mv-=CTj+=Znmf=Zw@mail.gmail.com>
Andrew Wong wrote:
Show 5 quoted lines
> On 3/19/13, Ramkumar Ramachandra <artagnon@gmail.com> wrote:
>> I know that this is expected behavior, but is there an easy way to get
>> rid of this inconsistency?
>
> You can actually rely on "rebase" to run the appropriate command.

Didn't Junio explicitly mention that this is undesirable earlier (from the point of view of `rebase -i` design)? The printed advice too, says that you should use `commit --amend` to finish the job before invoking --continue. Also IIRC, we don't allow --continue after staging changes in the sequencer.

Previous: Andrew WongNext: Jonathan Nieder
Message 3 of 10 in “[BUG?] rebase -i: edit versus unmerged changes”
  1. Ramkumar RamachandraMar 19, 2013
  2. Andrew WongMar 19, 2013
  3. Ramkumar RamachandraMar 20, 2013
  4. Jonathan NiederMar 20, 2013
  5. Junio C HamanoMar 20, 2013
  6. Ramkumar RamachandraMar 22, 2013
  7. Jonathan NiederMar 22, 2013
  8. Junio C HamanoMar 22, 2013
  9. Ramkumar RamachandraMar 23, 2013
  10. Junio C HamanoMar 24, 2013

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.