I’m wondering if you use any (graphical) clients to manage your Git, and if so, what client you use.
I myself have to use git professionally across all 3 major OS-es, and I currently use Sourcetree on Windows and macOS, and the Git tools built-in into IntelliJ on Linux.
Have given MaGit a try, but just couldn’t get all the shortcuts to stick in my mind.
Interested to hear your experiences!
CLI for me. I do use the GitLens plugin in vs code but only so I can see commit info inline. I never commit anything from vs code.
I like Kaleidoscope (v3) for diffs but not for merging. I could probably use any graphical difftool for this purpose but it’s what I’m used to.
FYI, VSCode can now natively show commit info inline, no GitLens extension required:
https://code.visualstudio.com/docs/getstarted/tips-and-tricks#_git-blame
Aah good to know, thanks! 🙏
The cli because it is consistent everywhere and has all fearures
Jah, mein fearures
Same, because its UX is actually really good. Years ago when I was new to git, I tried to use Sourcetree to revert a merge commit, and it would just fail. When I tried it in the CLI, it still failed, but it told me how to fix it. (I needed to specify which parent)
That, plus it’s scriptable, plus I’m in the terminal a lot anyway. I’ll also use the IDE git client sometimes if that’s where I am at the moment.
CLI first here too, for the same reason.
I’m not above using an editor plugin if it’s simple and reliable and right there waiting, like VSCodium.
vscode with edamagit and the cli
I use Sourcetree for routine stuff, though I occasionally have to hit the command line when shit gets real.
Lazygit.
I mostly use
gitfrom the cli, but when I want to use a frontend, I uselazygit. (I just find it easier to use TUI for some things like only committing some of the changed files, squashing, or fixup commits.)It works great from neovim so I’ve been using it a lot more since.
It’s what I use when I need a bit of a UI for some things. I use the terminal mostly but Lazygit is great.
It just works really well. I don’t mind the terminal commands but lazygit makes using git just so much nicer
Mainly the official git CLI for controlling branches and sub modules, and sometimes the GitHub CLI if quickly checking out a pull request from a forked repo.
Also use the source control tab in VSCode rather often, as it’s really convenient to review and stage individual line changes from its diff view, and writing commit messages with a spell check extension.
If it’s a big diff or merge conflict, I’ll break out the big guns like Meld, which has better visualizations for comparing file trees and directories.
About a decade ago, I used to use SmartGit, then tried GitKraken when that came around, but never really use much of the bells and whistles and wasn’t keen on subscription pricing. Especially as the UX for GitHub and other code hosting platforms online have matured.
Mostly Magit, some CLI
Magit is fantastic!!
I have tortoise git on a windows machine and GitHub desktop on a Mac. I do some things from the command line when I’m not feeling lazy.
I use VSCode and SourceGit. SourceGit is similar to Fork (which I’ve used before), but it’s FOSS and cross-platform (Windows/macOS/Linux).
I use plain old
gitfor the same reasons already mentioned, butmagitis the gold standard.I mostly use the cli, but also Sublime Merge. It makes some things really convenient (like committing only some lines in a changed file), and looking at diffs is snappy too.
Just fyi, you can add only a few lines of a changed file on the cli too using
git add -p
When I learned Git I think there were not decent tools, so I got used to the command line.
I occasionally use gitk for reviewing my commits- it’s nicer to see the files modified and be able to jump back and forth, although I get I could use
git log -pinstead.I’m an Emacs user, but I don’t use magit (!)
I like some of the graphical tools- some colleagues use Fork and I like it… but as I’ve already learned the CLI, I don’t see the point for me.
I could use learning some jj because it automates some of the most tedious parts of my workflow, but I’m getting too old.
CLI, nvimdiff 90% of the time. If I’m on a windows workstation, I might end up using git extensions GUI as it helps me visualize what’s happening a little better sometimes.
Git Graph VS Code extension
I’ve used source tree, gitkraken, etc. this simple extension is just as good. I spend most my day with it
