From: Phillip Wood <phillip.wood123@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Charvi Mendiratta <charvi077@gmail.com>,
git <git@vger.kernel.org>,
Christian Couder <christian.couder@gmail.com>,
Phillip Wood <phillip.wood@dunelm.org.uk>,
Taylor Blau <me@ttaylorr.com>
Subject: Re: How to implement the "amend!" commit ?
Date: Fri, 15 Jan 2021 10:29:26 +0000 [thread overview]
Message-ID: <81d3784c-fa64-a18d-9cc8-6ff50bbdd6ac@gmail.com> (raw)
In-Reply-To: <xmqq7dofxnru.fsf@gitster.c.googlers.com>
Hi Junio
On 14/01/2021 20:32, Junio C Hamano wrote:
> 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.
>> 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
next prev parent reply other threads:[~2021-01-15 10:31 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAPSFM5c2iqBn8_Dih2id7q6RRp0q=vfCSVUHDE5AOXZ8z3Ko9w@mail.gmail.com>
2021-01-13 1:15 ` How to implement the "amend!" commit ? Charvi Mendiratta
2021-01-13 18:24 ` Taylor Blau
2021-01-13 18:27 ` Taylor Blau
2021-01-14 8:06 ` Charvi Mendiratta
2021-01-14 10:39 ` Phillip Wood
2021-01-14 17:32 ` Taylor Blau
2021-01-15 10:42 ` Phillip Wood
2021-01-15 18:05 ` Martin Ågren
2021-01-14 20:32 ` Junio C Hamano
2021-01-15 10:29 ` Phillip Wood [this message]
2021-01-15 17:23 ` Junio C Hamano
2021-01-17 3:43 ` Charvi Mendiratta
2021-01-17 4:33 ` Junio C Hamano
2021-01-17 7:46 ` Charvi Mendiratta
2021-01-15 8:37 ` Charvi Mendiratta
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=81d3784c-fa64-a18d-9cc8-6ff50bbdd6ac@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=charvi077@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=me@ttaylorr.com \
--cc=phillip.wood@dunelm.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).