From: Taylor Blau <me@ttaylorr.com>
To: Phillip Wood <phillip.wood123@gmail.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>
Subject: Re: How to implement the "amend!" commit ?
Date: Thu, 14 Jan 2021 12:32:13 -0500 [thread overview]
Message-ID: <YACAHdDEMIgvQruK@nand.local> (raw)
In-Reply-To: <99b40665-45dd-6c4d-d46a-56c7dbf89568@gmail.com>
On Thu, Jan 14, 2021 at 10:39:50AM +0000, Phillip Wood wrote:
> > Secondly, As an alternative to above, we can use `--fixup=<commit>
> > --amend` and `--fixup=<commit> --reword`.
>
> This is not backwards compatible. At the moment If you create a fixup with
> `git commit --fixup=aaa` and then realize it should refer to commit bbb
> instead you can fix it with `git commit --amend --fixup=bbb`. That would no
> longer be possible.
Too bad. I felt that this was the most ergonomic idea put forwards, but
I also thought that we died with '--amend --fixup=xxx'. Its current
behavior does make sense to me, but it's too bad that we can't use it
for this new purpose.
I suppose the first option (the '--fixup=reword:xxx' one really is the
only one that can be implemented while preserving backwards
compatibility, so I think we have no choice but to go with that one.)
Thanks,
Taylor
next prev parent reply other threads:[~2021-01-14 17:37 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 [this message]
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
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=YACAHdDEMIgvQruK@nand.local \
--to=me@ttaylorr.com \
--cc=charvi077@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=phillip.wood123@gmail.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).