sublime_merge VS git-absorb

I've used this before and it is great. I mainly use Sublime Merge these days, though: https://www.sublimemerge.com/

Other good graphical git clients I have used in the past are Sublime Merge https://www.sublimemerge.com/ and SmartGit https://www.syntevo.com/smartgit/.

They are usually not expensive, and I learned git with GUIs.

I’m in the same boat. The best I’ve come up with is sublime merge, works well but I miss the keyboard shortcuts and it being part of the editor

Even though I am pretty comfortable (or was) with git cli, I'm not going back from sublime merge

Personally, I find it really helps me to see the repo history visualized as a tree, so I currently use Sublime Merge. I've used GitKraken and Sourcetree in the past. The git reference documentation maintains a list of git GUI clients, including mobile apps!

Nice, no need to look up past commits ! Didn't know about this, I had to look it up.

It's a separate project from git [0].

[0]: https://github.com/tummychow/git-absorb

Boy have I got the thing for you. git absorb - https://github.com/tummychow/git-absorb

The way to work with it is:

    git add file1

You can also manage via a holistic UI: - Bisection - Log and reflog, stashes - subtrees, submodules - certain third party subcommands like git-absorb, and extend it with your own - interact with issues and pull requests via forge - pretty much all of the hundreds of CLI flags via a modal UI that got generalized and extracted to a lib called transient - well-integrated diff and conflict resolution (which is mostly just smerge) - the rebase/cherry-pick workflows I liked the best, including support for --update-refs - at any time you can always press a key to see the raw commands and output that it's using, which taught me a ton of corner cases - IMO it has a great manual

I sometimes use git-absorb to help me if I made a tonne of changes, and can't be arsed to manually make the fixups

If done well, your git history carries the information of your process in a very similar way.

You have to be somewhere in the middle, so I'd say to do a semantic rebase at last step before merge. A fantastic tool that is not so well-known is git-absorb, which helps a lot doing that cleanly and automatically.

https://github.com/tummychow/git-absorb

Squash merge is like a sledge hammer, interactive rebase + git reset -N HEAD^ + git-absorb + git add -p (or even better, Magit) are surgical tools.