gersemi VS GitExtensions

I'm the author of formatter for CMake files gersemi with opinionated formatting style. Since I've reached features I need the project is in maintenance phase now and the maintenance itself requires very low effort. Of course if someone suggests an interesting missing feature on Github I'd certainly consider to implement it. As such I don't need a grant but I'm going to use this opportunity to share my project. :)

I agree that git is almost asking you to juggle commits.

My preference is to use temporary branches and cherry-picking instead of stashing; I mostly use a gui* to work with git so it is easy to select the two or three commits to cherry-picking or see visually if an interactive rebase would work.

* https://gitextensions.github.io/

I use Git Extensions myself as I find the git interface very straight forward, however they still have this fucking insane and frustrating issue: In the mergetool "Theirs" and "Mine" are swapped

Git Extensions is a more-intuitive way to manage your Git repositories in Windows. Its standalone interface serves as an effective, CLI-free means to control Git. Preferred by namtab00, because "SourceTree hides and shortcuts too much git functionality."

I presume this is where one goes to make a feature request? https://github.com/gitextensions/gitextensions/issues

If you're on Windows, I'd start with installing official Git. It comes with a Git Bash CLI and what not. There are also third party apps like GitExtensions and TortoiseGit if you want more UI/shell integration.

Everyone's going to downvote this, but I prefer the GUI over the command-line. I use http://gitextensions.github.io/

https://github.com/gitextensions/gitextensions/releases/tag/v2.51.05 - nice little ui for working with git. unfortunately, v2.51.05 is the last version that I can confirm works under mono (it was the last 2.x version and they completely rewrote the code from scratch in the 3.x series. My understanding was that it lost Linux compatibility at that point).