On Fri, Dec 20, 2019 at 3:07 PM SZEDER Gábor [off-list ref] wrote:

The subject prefix for this file is most of the time 'bash prompt' or
'git-prompt'.

On Fri, Dec 20, 2019 at 05:09:44PM +0000, Elijah Newren via GitGitGadget wrote:

quoted

From: Elijah Newren <redacted>

The prompt for am-based rebases was REBASE, while for interactive-based
rebases was REBASE-i.  A while ago, we switched merge-based rebases from
using REBASE-m to REBASE-i via re-implementing the merge backend based
on the interactive backend.  We will soon be changing the default rebase
backend to the interactive one, meaning the default prompt will be
REBASE-i rather than REBASE.  We have also noted in the documentation
that currently am-specific options will be implemented in the
interactive backend, and even the --am flag may eventually imply an
interactive-based rebase.  As such, change the prompt for an am-based
rebase from REBASE to REBASE-a.

I had a bit of a hard time following which rebase variant is
implemented with which backend and when it was changed, and... etc.

Sorry about that.  I could fix it up, but...

Makes me wonder: do we really need those "-i", "-m" or "-a" suffixes?
What benefit do they bring?  Why don't we just say "REBASE" in the
prompt?

Ooh, I like this idea.  A lot easier to explain in the commit message
and probably less confusing for users as well.