Re: [PATCH v9 5/5] history: re-edit a squash with every message

From: Matt Hunter <m@lfurio.us>
Date: Jul 18, 2026, 08:52 UTC
Message-ID: <DK1KIH6CXW0X.1U2V3GU8L6HB7@lfurio.us>
In-Reply-To: <fb76afe31c98833582d2b6be764fa3a1c8b71bbe.1784128573.git.gitgitgadget@gmail.com>

On Wed Jul 15, 2026 at 11:16 AM EDT, Harald Nordgren via GitGitGadget wrote:

> @@ -130,6 +131,15 @@ marker meant for a commit outside it. The body after an `amend!` subject
>  replaces the oldest commit's message when the marker targets that commit. As
>  an exception, a range made up entirely of markers for one target is combined
>  into a single commit, keeping the last `amend!` message if there is one.

> +The changes from every commit in the range are always folded in. Only the
> +message text differs.

This sentence kept puzzling me when I re-read this part. That isn't to say that it doesn't make sense on its own, or isn't correct. But in this context, I wasn't sure why it was included.

For whatever reason, the diff from your v8 made it click, and I believe you're trying to explain the previous sentence about the last `amend!`, stating that all the other _effects_ of the other fixup!s are also kept even though the message changes. Is that right?

If so, I might suggest removing this sentence too. At least to my brain, it doesn't contribute to my understanding of the command, and makes the paragraph feel like it changes subject in the middle.

Show 7 quoted lines

> +With `--reedit-message` the template mirrors `git rebase -i --autosquash`:
> +each `fixup!`, `squash!`, or `amend!` is grouped under the commit it
> +targets rather than shown in commit order. A `fixup!` message is dropped
> +(commented out in full), a `squash!` keeps its body with only the marker
> +subject commented, and an `amend!` replaces its target's message, unless
> +a `squash!` folded into that target first, in which case it keeps its
> +body like a `squash!`.

This bit that comes right after would possibly do better as its own paragraph imo.

Thanks!