From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com>,
git@vger.kernel.org, "Olliver Schinagl" <oliver@schinagl.nl>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Phillip Wood" <phillip.wood@dunelm.org.uk>,
"Christian Couder" <christian.couder@gmail.com>
Subject: Re: [PATCH] rebase -i: allow a comment after a "break" command
Date: Fri, 13 Jan 2023 12:17:27 -0800 [thread overview]
Message-ID: <xmqqwn5q1960.fsf@gitster.g> (raw)
In-Reply-To: <CABPp-BFf4pbRAy+Oaghx5d8DZgBjY_OUM-rJZna+JyNwx9WB-Q@mail.gmail.com> (Elijah Newren's message of "Thu, 12 Jan 2023 09:14:26 -0800")
Elijah Newren <newren@gmail.com> writes:
> Of course, the same applies to edit/squash/fixup/reword, though if I
> could go back in time...(warning, long tangent coming)...I would make
> it so those four directives did not accept any commit ID argument.
> Only "pick" and "reset" would accept a commit ID. Instead, today's
> "edit X" would be two commands ("pick X" followed by either "break" or
> "edit"), "fixup X" would be "pick X" + "fixup", and "reword X" would
> be "pick X" + "reword". That'd help users understand rebase state
> much better (it's so easy for users to get confused by whether they
> should be using `git commit --amend` vs. `git rebase --continue` and I
> think this is partially to blame, though there's other changes we
> could make to help with that dichotomy as well). The separate
> directives would also make it much easier to figure out how to both
> fixup and edit a single commit in the same rebase (pick the commit,
> then add a fixup directive, then an edit directive).
Intriguing, and I feel sad that it probably is too late for all of
the above X-<.
> In fact, "squash
> X" could just be discarded as superfluous, since it's just "pick X" +
> "fixup" + "reword" (or we could keep squash as an abbreviation for
> both "fixup" + "reword").
IIUC, your "fixup" is
git reset --soft HEAD^
git commit --amend --no-edit
i.e. discard the log message from "fixup" and use only its tree, and
your "reword" is
git commit --amend --edit
so "pick X" + "fixup" + "reword" would not be quite usable as a
replacement of our "squash X" (or your "pick X" + "squash"), I am
afraid. You'd want the log message from "X" as well as "X^" to
edit the replacement of X^.
next prev parent reply other threads:[~2023-01-13 20:17 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-12 10:36 [PATCH] rebase -i: allow a comment after a "break" command Phillip Wood via GitGitGadget
2023-01-12 11:14 ` Andrei Rybak
2023-01-12 16:26 ` Phillip Wood
2023-01-12 11:26 ` Olliver Schinagl
2023-01-12 12:25 ` Ævar Arnfjörð Bjarmason
2023-01-12 12:47 ` Olliver Schinagl
2023-01-12 16:20 ` Phillip Wood
2023-01-12 16:28 ` Ævar Arnfjörð Bjarmason
2023-01-12 18:04 ` Elijah Newren
2023-01-12 17:14 ` Elijah Newren
2023-01-13 20:17 ` Junio C Hamano [this message]
2023-01-14 2:47 ` Elijah Newren
2023-01-12 15:52 ` Junio C Hamano
2023-01-12 16:29 ` Phillip Wood
2023-01-12 16:46 ` Jeff King
2023-01-13 20:22 ` Junio C Hamano
2023-01-13 20:29 ` Sergey Organov
2023-01-17 15:33 ` Phillip Wood
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=xmqqwn5q1960.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=newren@gmail.com \
--cc=oliver@schinagl.nl \
--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).