gittuf VS GitExtensions

It actually does but it's very much in alpha/active development (under the umbrella of OpenSSF with the intent of being integrated into mainline git eventually).

https://github.com/gittuf/gittuf

Hey Will, thanks!

The paper is from quite a few years ago now and the reference is for a subset of gittuf's threat model, specifically the metadata manipulation / reference state attacks. The paper talks about MITM as one way to carry out a ref state attack, but if you're communicating with a compromised repository, you can be a victim of such an attack even if you're using authenticated transport and using signed commits / tags that you have a way of verifying.

We do have a threat model for gittuf that we've been meaning to add [0] to the design doc. I'll try and get that done today. It should probably be in there before we tag our alpha release. :)

[0] https://github.com/gittuf/gittuf/issues/95

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).