Toot

Written by Simon George on 2024-07-02 at 11:44

Any good tools that are an alternative to git rebase - either CLI or GUI?

Rebase is good for squashing, removing, and rewording commits. It’s okay at re-ordering commits, but often that causes conflicts when I think it shouldn’t.

What I really struggle with is:

• moving individual files from one commit to another
• moving hunks of files from one commit to another
• splitting commits into multiple commits each with different tanks and files

I know you can edit or break but it’s too fiddly.

=> More informations about this toot | View the thread | More toots from sfcgeorge@ruby.social

Mentions

Tags