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
Johan Herland <johan@herland.net>
Date
Jan 15, 2009, 13:54 UTC
Message-ID
<200901151454.30670.johan@herland.net>
In-Reply-To
<bd6139dc0901150352t2d2fa388x3eb842bbc8c4baa6@mail.gmail.com>
On Thursday 15 January 2009, Sverre Rabbelier wrote:
Show 5 quoted lines
> On Thu, Jan 15, 2009 at 11:01, Johan Herland wrote:
> > "modify" does the "git reset --soft HEAD^" (Anders' suggestion)
> > "amend" requires a "git commit --amend" (current behaviour)
>
> Why have amend do the same as edit?

The names I chose are somewhat arbitrary, since we obviously have to keep on bikeshedding until we have something everybody can agree to.

However, my rationale was that IMO the word "edit" more closely matches Anders' suggestion, and is therefore somewhat misleading as a description of the current behaviour. But we obviously cannot change the meaning of "edit" without upsetting current users. Therefore, introduce "amend" to more accurately describe the current behaviour. As for "modify", it was simply the best synonym for "edit" I could find.

...Johan
-- 
Johan Herland, <johan@herland.net>
www.herland.net
Previous: Björn Steinbrink
Message 55 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.