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

Re: [PATCH] rebase -i: only automatically amend commit if HEAD did not change

From
Avery Pennarun <apenwarr@gmail.com>
Date
Jul 23, 2008, 15:55 UTC
Message-ID
<32541b130807230855y19bbedfah38dce9391ff4f481@mail.gmail.com>
In-Reply-To
<7viquxjwyf.fsf@gitster.siamese.dyndns.org>
On 7/22/08, Junio C Hamano <gitster@pobox.com> wrote:
Show 9 quoted lines
> "Avery Pennarun" <apenwarr@gmail.com> writes:
>  > Why doesn't "edit" just stage the commit and not auto-commit it at
>  > all?  That way an amend would *never* be necessary, and rebase
>  > --continue would always do a commit -a (if there was anything left to
>  > commit).  The special case fixed by this patch would thus not be
>  > needed.
>
> That would actually be in-line with the way how "rebase --skip" does the
>  resetting without asking the user to do so, wouldn't it?

I'm not sure exactly what you mean, but I think with my proposed change, "rebase --skip" would do "git reset --hard HEAD" while "rebase --continue" would do "git commit -a", so it would be nice and symmetrical, where currently it isn't exactly.

Have fun,
Avery
Previous: Junio C HamanoNext: Dmitry Potapov
Message 5 of 14 in “rebase -i: only automatically amend commit if HEAD did not change”
  1. rebase -i: only automatically amend commit if HEAD did not changeJohannes Schindelin, Jul 22, 2008
  2. Stephan BeyerJul 22, 2008
  3. Avery PennarunJul 22, 2008
  4. Junio C HamanoJul 22, 2008
  5. Avery PennarunJul 23, 2008
  6. Dmitry PotapovJul 23, 2008
  7. Avery PennarunJul 23, 2008
  8. Johannes SchindelinJul 23, 2008
  9. Avery PennarunJul 23, 2008
  10. Junio C HamanoJul 23, 2008
  11. Johannes SchindelinJul 24, 2008
  12. Stephan BeyerJul 24, 2008
  13. Junio C HamanoJul 25, 2008
  14. Johannes SchindelinJul 25, 2008

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.