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

Re: [PATCH] Completion: Hint whether amend is the right thing to do.

From
Shawn O. Pearce <spearce@spearce.org>
Date
May 28, 2008, 23:16 UTC
Message-ID
<20080528231622.GL30245@spearce.org>
In-Reply-To
<7v63sywhkr.fsf@gitster.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> wrote:
Show 5 quoted lines
> Robin Rosenberg <robin.rosenberg.lists@dewire.com> writes:
> 
> > When you get a conflict during interactive rebase the next
> > thing to do is not to amend, but to continue the rebase.
> > With this change you get a reminder in the prompt.
...
> Does this mean that it would help reduce mistakes if "git commit --amend"
> noticed the presense of .dotest-merge but absense of .dotest-merge/amend
> and refused to operate, I have to wonder?

Yea, even though rebase and commit are two different tools we don't want the user to amend in the middle of a failed conflict from rebase. Adding the safety valve to commit --amend makes more sense to me than teaching bash to show you the state. Not all of our users use bash. Not all of our bash using users use the bash completion package, or the _git_ps1 function we ship. Etc.

I'd rather see the amend safety net than the bash prompt change.
-- 
Shawn.
Previous: Junio C HamanoNext: Robin Rosenberg
Message 3 of 6 in “Completion: Hint whether amend is the right thing to do.”
  1. Completion: Hint whether amend is the right thing to do.Robin Rosenberg, May 28, 2008
  2. Junio C HamanoMay 28, 2008
  3. Shawn O. PearceMay 28, 2008
  4. Robin RosenbergMay 28, 2008
  5. Junio C HamanoMay 28, 2008
  6. Shawn O. PearceMay 28, 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.