Vscode with the Git Graph extension.
Programming
Welcome to the main community in programming.dev! Feel free to post anything relating to programming here!
Cross posting is strongly encouraged in the instance. If you feel your post or another person's post makes sense in another community cross post into it.
Hope you enjoy the instance!
Rules
Rules
- Follow the programming.dev instance rules
- Keep content related to programming in some way
- If you're posting long videos try to add in some form of tldr for those who don't want to watch videos
Wormhole
Follow the wormhole through a path of communities !webdev@programming.dev
I use Sourcetree for routine stuff, though I occasionally have to hit the command line when shit gets real.
i loved fork on windows but i'm too lazy to set up wine to try and get it to work now i just use git cola and the cli.
I use SourceGit as a Fork alternative on Linux, it's pretty similar
Whatever's built into pycharm or vscode for looking at diffs. Command line for push pull squash etc
Mostly vscode, and GitHub desktop for projects that I don’t use vscode for. I want to learn how to use the CLI, I just didn’t get around to it yet.
Vscode and gitlens for routine stuff, and then just CLI when push comes to shove and I need some more advanced feature.
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).
Git cola
I'm an Emacs users, so unsurprisingly I use magit, but perhaps surprisingly I use it sparingly, using Emacs's VC most of the time.
I will install emacs on a machine just to use magit.
LazyGit and GitKraken. I try to use LazyGit as much as possible, but a few things are easier for me in GitKraken (as I'm more used to it).
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.
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.
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.
Tried idea community edition, honestly not bad, like vs code slightly more even tho with an extension or two you can make how they function very similar. Wanted to use idea because it matched the gtk theme, but if I was gonna use an extension for vs code like navigation might as well use vs code. Both easy to use with git as a dabbler.
vscode with edamagit and the cli
For professional use I’ve heard good things about SmartGit, unfortunately my work refused to buy me a license and the trial period wasn’t long enough for me to really form an opinion.
Work suggests to use SourceTree but it is way too sluggish.
These days I use git CLI for most things, and VSCode to review changes and submit PRs. Of course this also assumes you use a decent shell with git support, like Oh-My-Posh or similar, so it is always clear what you are working on.
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
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
Lazygit and magit
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 -p
instead.
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.
I made some automation in python for common git tasks and use the cli otherwise. I tried a couple like sourcetree and the built in automation for VS but they're either slow or lack features i'd like.
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.
Github desktop, despite the name it's just a git client. Absolutely clownish that there's no official Linux support (there's a fork which works perfectly). I use it to interact with self-hosted gitea, codeberg and github, pretty happy with it, I'm Aldo testing git butler