Feature Request: Add Option to Squash Selected Contiguous Commits

[thomaschampagne]

Hi there!

First of all, I want to express my appreciation for the incredible work you've done with this project! I've been searching for a well-designed, open-source Git client across Windows, macOS, and Linux for years. This tool is a breath of fresh air compared to others like SmartGit, Sublime Merge, SourceTree, LazyGit, GitHub Desktop, Gitkraken, ...

I was wondering if there's any plan to add an option to squash selected contiguous commits via a right-click menu? This feature is available in several other clients like SmartGit, GitHub Desktop, LazyGit, and Fork (if I recall correctly).

Example:

Here's a quick example of the usage from GitHub Desktop:

This feature would be incredibly useful for streamlining commit history and making the tool even more powerful.

Thanks again for your amazing work, and I look forward to hearing your thoughts on this feature request!

Best regards,

Thomas

[love-linger]

There are several ways to do that.

• You can use Interactive Rebase context menu item of selected commit. For example:

• You can use Squash context menu item of commit if the target commits are starts with HEAD
• You can use Reset context menu item of the selected commit with soft mode. The re-commit the contents

[love-linger]

BTW, you can enable Amend option while committing if you want amend your HEAD commit

[thomaschampagne]

@love-linger Thanks for your response. I had tested interactive rebase before posting this issue :).

My main concern is actually to find a way to quickly squash multiple consecutive commits without the need to manually select each one or figure out the right parent commit to start an interactive rebase for this purpose. The current method requires squashing manually each commit individually except for the last one which is the direct child of parent commit selected for interactive rebase (the one we have to figure out).

The feature can essentially be summed up as: "A convenient way to squash/fixup a large selection of commits."

Thanks again for your amazing work !

Thomas

[love-linger]

But usually, the historical commit view is very complex, such as:

it mixes the commits both in current branch and other branches. It need more options to select the commits you want to squash via Ctrl+Click.

[love-linger]

I'd like add a context menu item - Squash Commits Since This, for the commit that meets the following conditions:

• Contains in current branch
• Not the current HEAD commit

It will squash all commits since selected commit in current branch (include selected) into one commit

[love-linger]

You can try it from https://github.com/sourcegit-scm/sourcegit/actions/runs/10547463901

[thomaschampagne]

I tested ! It's a nice quick win !! THANKS !!!

About formulation what about:

• "Squash child commits into this one" ?
• "Squash child commits to here"?

Adding "child" word helps to refer to "Contains in current branch" & "Not the current HEAD commit" IMO.

To thanks you, I can provide you a fr_FR.axaml file if you want (I seen that french translations are missing, and I'm french)

Thanks again for your work !

[love-linger]

thanks very much.

there is already a French translation in 'develop' branch.

[thomaschampagne]

there is already a French translation in 'develop' branch.

Do you need a review?

[love-linger]

I think they have done this job. See #405.

[thomaschampagne]

I think they have done this job. See #405.

It's not completely translated. Many values remains in full english. I will give a look ;)