Re: Git Feature Request (Fixdown in interactive rebase)

From: Charvi Mendiratta <charvi077@gmail.com>
Date: Jan 27, 2021, 07:55 UTC
Message-ID: <CAPSFM5d79AEx478twqrLpUuhq1+mF_bvOsfyvRuQVgQO167DrA@mail.gmail.com>
In-Reply-To: <CAM0jFOdCD1uEcHaPB_go7aarapEBKx6M4d35zVOP8h9=MuZEmA@mail.gmail.com>

Hi,

On Thu, 24 Dec 2020 at 04:42, Mike McLean <stixmclean@googlemail.com> wrote: [...]

Show 14 quoted lines

> =-=-=-=-=-=-=-=
>
> During an interactive rebase, the text file defining the operations
> has a command option for "fixup".
> This will squash the target commit into the previous commit (listed
> above it in the file), and automatically use the commit message of the
> previous commit (thus bypassing the "choose the commit message"
> dialog/file).
>
> Can we have a similar convenience-command that squashes, and retains
> the second commit's message? Purpose is the same as the fixup command
> - saving a bit of time and unnecessary typing during a common
> operation.
>

It seems that this FR is addressed by the patches as here[1], which are under review. It adds the options to fixup command i.e fixup [-C|-c] in the interactive rebase that gives the flexibility to select or edit the commit message while fixing up the commit using fixup command. So, changing `pick` command to `fixup -C` will fixup the content and replace the previous commit message with the second commit message(ie. the fixup commit message).

Thanks and Regards, Charvi

[1] https://lore.kernel.org/git/20210124170405.30583-1-charvi077@gmail.com/