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

Re: [RFC PATCH] Make the rebase edit mode really end up in an edit state

From
Boyd Stephen Smith Jr. <bss@iguanasuicide.net>
Date
Jan 15, 2009, 05:00 UTC
Message-ID
<200901142300.31718.bss@iguanasuicide.net>
In-Reply-To
<buo8wpdfbv9.fsf@dhapc248.dev.necel.com>

On Wednesday 14 January 2009, Miles Bader <miles@gnu.org> wrote about 'Re: [RFC PATCH] Make the rebase edit mode really end up in an edit state':

Show 9 quoted lines
>"Boyd Stephen Smith Jr." <bss@iguanasuicide.net> writes:
>>>We may need a version bump to 1.7.0 to update the UI for this command,
>>> but please do test rigorously to build a stronger case for a saner UI.
>>
>> Instead of changing the meaning of edit, how about introducing a
>> "replace" command?
>
>That seems like at best an awkward workaround, not a real solution to
>the problem,

Actually, I think it's a better solution (or rather a solution to the real problem) because others have already said they like and expect the current edit behavior.

The "real problem" is you need different behavior for your interactive rebasing.

>which is that the term "edit XXXX" suggests you're starting 
>with XXXX and modifying it.

Exactly. "edit" is: While interactively rebuilding history (rebase -i), you get to the first place that commit existed and then modify it (commit --amend or other tools).

>The term "replace" by contrast, seems more 
>to connote entirely removing XXXX and substituting something else.

Exactly. "replace" is: While rebasing you stop just before the commit existed (changes are even staged) and decide to do something else (like using add -i and a few commit commands to split the thing up or whatever).

>[I do wonder how on earth the current awkward behavior was accepted in
>the first place...]

(Actually, I do too, but it's accepted and expected behavior now--good reason not to change it.)

-- 
Boyd Stephen Smith Jr.                     ,= ,-_-. =. 
bss@iguanasuicide.net                     ((_/)o o(\_))
ICQ: 514984 YM/AIM: DaTwinkDaddy           `-'(. .)`-' 
http://iguanasuicide.net/                      \_/     
Previous: Miles BaderNext: Junio C Hamano
Message 5 of 55 in “Make the rebase edit mode really end up in an edit state”
  1. Make the rebase edit mode really end up in an edit stateAnders Melchiorsen, Jan 15, 2009
  2. Junio C HamanoJan 15, 2009
  3. Boyd Stephen Smith Jr.Jan 15, 2009
  4. Miles BaderJan 15, 2009
  5. Boyd Stephen Smith Jr.Jan 15, 2009
  6. Junio C HamanoJan 15, 2009
  7. Johannes SchindelinJan 15, 2009
  8. SZEDER GáborJan 15, 2009
  9. Junio C HamanoJan 15, 2009
  10. Sverre RabbelierJan 15, 2009
  11. SZEDER GáborJan 15, 2009
  12. Björn SteinbrinkJan 16, 2009
  13. Johannes SchindelinJan 16, 2009
  14. Anders MelchiorsenJan 18, 2009
  15. Junio C HamanoJan 16, 2009
  16. Johannes SchindelinJan 16, 2009
  17. Stephan BeyerJan 15, 2009
  18. Johannes SchindelinJan 15, 2009
  19. Johannes SixtJan 15, 2009
  20. Johan HerlandJan 15, 2009
  21. Sverre RabbelierJan 15, 2009
  22. Johannes SchindelinJan 15, 2009
  23. Adeodato SimóJan 15, 2009
  24. Johannes SchindelinJan 15, 2009
  25. Sverre RabbelierJan 15, 2009
  26. Stephan BeyerJan 15, 2009
  27. Johannes SchindelinJan 15, 2009
  28. Adeodato SimóJan 15, 2009
  29. Sverre RabbelierJan 15, 2009
  30. Johannes SchindelinJan 15, 2009
  31. Sverre RabbelierJan 15, 2009
  32. Junio C HamanoJan 15, 2009
  33. Sverre RabbelierJan 15, 2009
  34. Johannes SchindelinJan 15, 2009
  35. Johan HerlandJan 15, 2009
  36. Anders MelchiorsenJan 15, 2009
  37. Johannes SchindelinJan 15, 2009
  38. Wincent ColaiutaJan 15, 2009
  39. Jay SoffianJan 15, 2009
  40. Wincent ColaiutaJan 15, 2009
  41. Johan HerlandJan 16, 2009
  42. Anders MelchiorsenJan 16, 2009
  43. Johan HerlandJan 16, 2009
  44. SZEDER GáborJan 16, 2009
  45. Johannes SchindelinJan 16, 2009
  46. SZEDER GáborJan 16, 2009
  47. Wincent ColaiutaJan 16, 2009
  48. Sverre RabbelierJan 16, 2009
  49. Stephan BeyerJan 16, 2009
  50. Johannes SchindelinJan 16, 2009
  51. Pieter de BieJan 15, 2009
  52. Sverre RabbelierJan 15, 2009
  53. Pieter de BieJan 15, 2009
  54. Björn SteinbrinkJan 15, 2009
  55. Johan HerlandJan 15, 2009

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.