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

Junio C Hamano [off-list ref] wrote:

Robin Rosenberg [off-list ref] writes:

quoted

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.