From: Harald Nordgren <haraldnordgren@gmail.com>
Date: Mon, 15 Jun 2026 08:18:38 GMT
Subject: Re: [PATCH 0/2] rebase: add --fixup to fold a range into its oldest commit
Message-ID: <CAHwyqnWa55xbTpzq-Nf6cMyvgR1yYgg8fhvgMFkquSEGPUwDmg@mail.gmail.com>
In-Reply-To: <xmqqqzm8d0j7.fsf@gitster.g>

> > Adds git rebase --autosquash --fixup [<upstream>] to fold a range of commits
> > into its oldest one, reusing that commit's message.
>
> [2/2] seems to add "--fixup-all" but I agree with the "related idea"
> that naming it and modelling it after "merge --squash" would be
> easier to understand.

Sounds reasonable.

> I also wonder if we can do something like this without adding any
> new option or command.  E.g., if you have four patch series, where
> the initial implementation HEAD~3 is followed by "oops it was still
> wrong" fix-up HEAD~2, HEAD~1 and HEAD, then
>
>     git reset --soft HEAD~3 && git commit --amend --no-edit
>
> is what the user wants to do, no?

I don't think it's enough. First of all the user has to know the N for
HEAD~N, and then 'git reset --soft HEAD~N && git commit --amend
--no-edit' is still quite ugly.


Harald