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

Re: git rebase --interactive commits order

From
Junio C Hamano <gitster@pobox.com>
Date
May 11, 2011, 17:24 UTC
Message-ID
<7v39klgng7.fsf@alter.siamese.dyndns.org>
In-Reply-To
<BANLkTikV_TSEE1cgr=EOhuD0f8KP2vh-tA@mail.gmail.com>
Richard Peterson <richard@rcpeterson.com> writes:
Show 9 quoted lines
> On Tue, May 10, 2011 at 7:26 PM, Junio C Hamano <gitster@pobox.com> wrote:
>>
>> Devils lie in the details.  For example, should squash/fixup come before
>> or after the squashed commit when --reverse is in effect, and why?
>>
>> Should "rebase --reverse --continue" work after it gets interrupted, if
>> not why not?
>
> Yes, it should work,...

Of course, if you start with --reverse, it is clear and obvious that 'continue' should continue with the reversed instruction sheet, and it probabaly should take --reverse as a no-op when given with --continue. The original question should have been written more carefully to avoid soliciting the response that addresses that uninteresting case.

You start 'rebase' (without --reverse); it stops with conflict. Now what should happen when you say 'rebase --reverse --continue' now? Does it error out because you are not allowed to change your mind once you started?

That would make it inconsistent for the same "--reverse --continue" not to error out when the entire process was started with --reverse, but erroring it out in that case would be awkward.

I am not saying that these small details cannot be worked out. I am saying that you would need to spend a lot of effort to take care of the details to avoid making it confusing to the users. And I am also saying that it is not even worth wasting the brainpower spent discussing these in this thread, if the only "benefit" resulting from it is to add an option that allows some people to have an ordered list of things to do "First I do this and then I do that" that has to be read backwards. Why spend extra effort only to introduce something confusing?

Previous: Richard PetersonNext: Richard Peterson
Message 8 of 14 in “git rebase --interactive commits order”
  1. Philippe VaucherMay 9, 2011
  2. DavidMay 9, 2011
  3. Steven E. HarrisMay 9, 2011
  4. Philippe VaucherMay 10, 2011
  5. Sverre RabbelierMay 10, 2011
  6. Junio C HamanoMay 10, 2011
  7. Richard PetersonMay 11, 2011
  8. Junio C HamanoMay 11, 2011
  9. Richard PetersonMay 11, 2011
  10. Philippe VaucherMay 11, 2011
  11. Nicolas SebrechtMay 13, 2011
  12. Philippe VaucherMay 14, 2011
  13. Junio C HamanoMay 10, 2011
  14. Philippe VaucherMay 10, 2011

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.