Re: [PATCH v4 0/4] history: add squash subcommand to fold a range

From: Patrick Steinhardt <ps@pks.im>
Date: Jun 22, 2026, 11:54 UTC
Message-ID: <ajkijomPo_kXSXul@pks.im>
In-Reply-To: <pull.2337.v4.git.git.1782021195.gitgitgadget@gmail.com>

On Sun, Jun 21, 2026 at 05:53:11AM +0000, Harald Nordgren via GitGitGadget wrote:

Show 10 quoted lines

> Adds git history squash <revision-range> to fold a range of commits.
> 
> Changes in v4:
> 
>  * git history squash now detects when another ref points at a commit inside
>    the range being folded and refuses, with an advice.historyUpdateRefs hint
>    to use --update-refs=head.
>  * A merge inside the range is folded fine as long as the range has a single
>    base; a range with merge commit at the tip or base also folds correctly.
>    Only a range with more than one base is rejected.

Some of the conceptual questions on v3 are still open, like for example whether we should be using "--ancestry=". Please make sure that you are replying to questions like that when rerolling, especially when you don't plan to address them. Otherwise the reviewer will not know why you didn't take feedback into account. See also the thread at [1] for guidance.

I'll wait for open questions to be addressed before reviewing this (or any subsequent) version.

Thanks!

Patrick

[1]: <xmqqv7bhxiby.fsf@gitster.g>