Re: How to implement the "amend!" commit ?

From: Phillip Wood <phillip.wood123@gmail.com>
Date: Jan 15, 2021, 10:29 UTC
Message-ID: <81d3784c-fa64-a18d-9cc8-6ff50bbdd6ac@gmail.com>
In-Reply-To: <xmqq7dofxnru.fsf@gitster.c.googlers.com>

Hi Junio

On 14/01/2021 20:32, Junio C Hamano wrote:

Show 7 quoted lines

> Phillip Wood <phillip.wood123@gmail.com> writes:
> 
>> This is the only option that is backwards
>> compatible. `--fixup=:/<text> ` still works and can be used with the
>> new syntax as `--fixup=amend::/<text>`.
> Do you mean both "--fixup=:/<text>" and "--fixup=amend::/<text>"
> work and do the same thing?  If so, that is good.

"--fixup=:/<text>" will work as it does now and "--fixup=amend::/<text>" will create an amend! commit.

Show 8 quoted lines

>> Note that we intend to allow
>> accept any prefix of "amend" and "reword" so --fixup=a:<commit> would
>> work.
> 
> "a" and "r" may happen to be unique but we would not want to be
> limited to these two forever---future developers are allowed to
> invent other clever variants.  So let's say "accept unique prefix as
> abbreviation for these operating mode words like 'amend' and 'reword'"

Sure - that's actually what I meant but I wasn't very clear

Do you think we want to support "--fixup=squash:<commit>" so there is a uniform way for creating all flavors or is that just going to be confusing when we have "--squash=<commit>" already?

Best Wishes

Phillip