Programming

It's a paid app only available for Windows and Mac at the moment, but Fork may be worth a look: https://git-fork.com

TortoiseGIT

Sublime Merge has been wonderful to work with

Magit with emacs (doom emacs to be fully honest). More a TUI, but definitely fully keyboard driven :)

I used to use SourceTree but it runs horribly and switched to Fork years ago and never looked back. I use VSCode for merge conflict resolution.

I use a 50%-50% mix between git CLI and the built-in git tools in JetBrains IDEs.

To be honest, I could quite easily get by with just the JetBrains GUI - they have a super sophisticated GUI that can easily handle things like interactive rebase, cherry-picking, etc + they have a great conflict resolution tool. I just use the cli every now and then if I want to get something done quickly while I don't have an IDE window open.

These days I can run everything I need to with the git cli. I use the JetBrains visual merge tool to resolve conflicts, because doing that by hand is so awfully error prone, it very very intuitively maps to a visual process

Lazygit changed how I use git, it is so easy to do all the daily essentials like branching, committing, and merging, but also also does more advanced things like interactive rebasing when needed.

I had searched for a proper git client, that was free and open source plus worked on both Linux and Windows, for a long time and I haven't looked back after finding lazygit.

Apart from the cli, gitk and git-gui are plenty good in my opinion, they could always be made better. And they are mostly always there with git Only thing I am miasing now is blame.

The number of Git front ends with proprietary licenses is too damn high.

GittyUp! https://murmele.github.io/Gittyup

I previously used GitKraken but was looking for an open source alternative that works in a similar fashion and has a Flatpak.

I use the VS Code built-in git support for making commits, and fall back to the CLI for anything else.

You won't have trouble remembering commands once you use them often enough. And you don't need to know all of them, just the ones your workflow uses. My toolbox is commit, checkout, status, reset, rebase -i, merge, bisect. That's all I need day-to-day.

I actually like the tooling built into VS Code. Added the GitHub Pull Requests and Issues extension for the PRs, pretty happy with it all at the moment. Before that I like a specific older version of SourceTree that didn't forget your credentials.

For daily work, I use the git integration built into my IDE. Occasionally I need the CLI for something complex.

VS 2022 is finally somewhat usable for Git using the git Changes pane. The whole team uses it this way, and for many of them it's a first for git as well.

I use GitHub Desktop for 95% of my git needs, terminal for the other 5%

TortoiseGit user here. Love that it integrates with Windows Explorer so I don't have to constantly be opening an app first to fire off some Git commands.

No, I find typing faster than clicking and I've been using git for so long the commands are second nature to me.

I use Lazygit, which is a TUI. It is entirely controlled by keyboard shortcuts and has a lot of quick ways to do tedious things.

I use a mix of CLI, the Git UI built into VSCode, and Sublime Merge.

Sublime Merge is great for getting an overview, it's very snappy (especially when compared to Electron Git UIs), and I love the merge conflict editor. It's not cheap, but worth every penny.

I use IntelliJ's built-in git GUI.

I don't understand why people use command line only. Sure, learn the commands so if you need to use them you can, but most GUIs are far more feature rich than command line. With IntelliJ, I can easily view differences before committing, have it do code quality scans, automatically clean up any code it can, more easily choose which files I want to commit vs the typical 'git add .' I see most people do with command line, have separate changelists when pair programming, and much more.

One argument that continually comes up is that command line is faster. I completely disagree. If I want to just commit the code without reviewing it, I can use 2 hot keys and the code is committed and pushed. But as I do a quick readthrough of all the code first and review issues from the code quality analysis it does take more time, but still less than it would to do comparable things with command line.

I use the TUI gitui Though I also use the git cli directly too, depends on what I'm doing.

I used to use GitKraken at my old job and loved it most of the time, slick UI and generally did what you wanted to do.

I'm using Atlassian SourceTree at my current place since it's what they give us and it's...fine. Not as nice as GitKraken.

I mainly use them because I originally used TFS's TFVC when I started my career and when we transitioned to Git, I started out using a GUI so never really learned to use the CLI.

i just use Visual Studio or VS Code

when I absolutely need to... git-gui.

Live by the console, die by the console.

(I should change things up and try to make my life easier -- vim for life) 🙃

I've been using the git gui extension for a while and resolve conflicts in vs code. I also just use a lot of cli

Since I use Emacs I've been really happy with Magit, even tho it's UI has a bit of a learning curve to it. I've been also trying out Gitg since I moved back to GNOME and it's been really solid as well. It lacks a couple really nieche features but otherwise as a fast commit tracking/writing tool it's very good.

Gitkraken is the powerhouse, but i only use it for difficult commands

I use GitKraken. It has a beautiful interface. It's free to use non-commercially but I pay $50/yr so that it can connect to my companies Enterprise account. I know I'm weak with git (I get the concepts but I'm a visual person) so the money is worth it to me.

My inbox got fediversized, fantastic feeling.

Hey hey hey, I want that too!

As for git, I just use the plugin on VS code. Nothing fancy. I didn't even know there's other options like GUI to be honest.

Closest I get to a gui is magit in emacs.

I use VSCode for simple commits and merge conflicts. Anything more complicated and I go to CLI since it's usually better documented.

I use GitHub Desktop - offered by GitHub themself. Its a GUI application where you can fetch, push, pull etc. But mostly just basic github "commands".

https://desktop.github.com/

I use github desktop since I'm not using git a lot, and that gui is very easy to understand

"No. No, man. Shit, no, man. I believe you'd get your ass kicked, sayin' somethin' like that, man." - Office Space

That said and jokes aside, occasionally I'll use the integrated git in vscode but mostly use the terminal. I do recommend a Git cheat sheet to help become more proficient with the CLI interface.

~~Atlassian~~ Github Git Cheatsheet: Changed to the Github version as the Atlassian one was an auto-downloading PDF.

If you have trouble remembering git commands for CLI have a look at the tool tldr:

https://man.archlinux.org/man/tldr.1.en

For example if you need to remember how to use the branch command you could look it up with

tldr git branch

which would give you an overview on the most popular use cases.

And in case you don't already know: You may want to use the history search tool of your shell by hitting CTRL-r and then for example typing branch. You'd get a list of past commands you have used containing branch that you can flip through by repeatedly hitting CTRL-r.

I kinda do both? For some reason, I prefer the CLI when I clone a repo, but Sourcetree for committing, pulling, and pushing, and my IDE's built in git tools for merges.

I've tried a lot and settled with vim-fugitive. If you know and like Vim-keybindings it's probably the best choice out there.