search

sublimehq / sublime_merge

Issue tracker for Sublime Merge
https://www.sublimemerge.com
272 stars 14 forks source link

Autosquash: autocomplete or UI support "fixup!" and "squash!" commit messages #1844

Open odbol opened 7 months ago

odbol commented 7 months ago

Problem description

It would be nice to have built-in support for rebase --autosquash: https://andrewlock.net/smoother-rebases-with-auto-squashing-git-commits/

Preferred solution

When starting a new commit message with "fixup!" or "squash!", pop up an autocomplete UI with recent commit subject strings, so you can click to insert the commit's subject in there. Then my commit will be ready for autosquash.

Alternatives

Maybe right-click an existing commit and choose "Autosquash -> fixup" or "squash", which opens a panel of recent commits to choose from. Choosing a commit will prepend the "fixup! [commit subject]" to the beginning of your commit message, so it's ready to autosquash.

intelfx commented 4 months ago

Potential duplicates: #236, #449 (the latter provides a workaround in form of a custom menu entry).

That said, +1, I'd really like to have this coupled with Sublime's wonderful command palette system with fuzzy search.