Re: Question: is there a short way to merge the last commit to the second last one?

From: Phillip Wood <phillip.wood123@gmail.com>
Date: Jun 8, 2025, 19:31 UTC
Message-ID: <993914f7-5023-459c-b1e8-ebec2646e243@gmail.com>
In-Reply-To: <aEXdKMjAbry1aTXe@tapette.crustytoothpaste.net>

On 08/06/2025 19:57, brian m. carlson wrote:

Show 5 quoted lines

> 
> If your goal is to just do the fixups and squash and not anything else
> interactive, then you can do this:
> 
>      GIT_SEQUENCE_EDITOR=true git rebase -i --autosquash

Just a quick note to say that since git v2.44.0 you can just run

	git rebase --autosquash

and it will squash any fixup commits without asking you to edit the todo list.

Also "git commit --fixup=amend:HEAD^" allows you to edit the original commit message and this new message will be used when the commit is squashed by "git rebase --autosquash"

Best Wishes

Phillip