Ancestors

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 | More toots from sfcgeorge@ruby.social

Descendants

Written by Oğulcan Girginç on 2024-07-02 at 20:09

@sfcgeorge not sure this will help but I can suggest using Lazygit[1]. IMO, its UI is very intuitive.

[1] https://github.com/jesseduffield/lazygit

=> More informations about this toot | More toots from ogirginc@ruby.social

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

@ogirginc thanks that looks awesome! I don’t know if it’ll be that much easier for rebase but I’ll see :)

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