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

Re: git rebase interactive: usability issue

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 26, 2008, 03:32 UTC
Message-ID
<7vbq1ovpl7.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<alpine.DEB.1.00.0806260416410.4503@eeepc-johanness>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> NACK.
>
> You just broke the 'edit' command.
Really?  I thought it would be Ok for "edit" command.

The patch checks the presense of /amend and complains only if it does not exist, while you create /amend when you respond to "edit" insn.

I was relunctant about the patch not because of "edit", but because I am not convinced that it will _never_ make sense to be able to amend while the sequence stops with a conflict (as the patch does not give us any way to override this rather heavy-handed denial to continue).

I also was hoping that with enough hooks git-commit already calls, this could have been experimented and implemented with hooks without touching C layer at least initially, while people can convince themselves that the approach is sane (i.e. it _never_ makes sense to do amend upon conflict).

Previous: Johannes SchindelinNext: Avery Pennarun
Message 3 of 7 in “git rebase interactive: usability issue”
  1. Dmitry PotapovJun 25, 2008
  2. Johannes SchindelinJun 26, 2008
  3. Junio C HamanoJun 26, 2008
  4. Avery PennarunJun 26, 2008
  5. Dmitry PotapovJun 26, 2008
  6. Theodore TsoJun 26, 2008
  7. don't allow 'commit --amend' during rebase conflict resolutionDmitry Potapov, Jun 26, 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.