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

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.

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

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

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.

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

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.

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.

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

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.

Developing in a Windows environment, I generally prefer Git Extensions.
It doesn't distract the eye with unneeded fancy and is very close to a command line git experience but still allows me a better visual sense of the repository and branches.

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

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

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 just use Visual Studio or VS Code

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

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 use sublime merge because I really like ST and want to further support the dev. I wish it had more integrations with github (and theoretically github alternatives), but I understand the reasoning not to. Before SM came out I just used the command line exclusively.

KDE has a relatively new git tool named Kommit: https://apps.kde.org/de/kommit

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.

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.

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 don't use a GUI, with the exception of Meld as my primary difftool

At work I wish they were using git. But we got SVN. How I long for the ability to use pull requests. But tortoiseSVN has some nice features (I'm stuck with windows over there) even if it's lacking in overall functionality.

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/

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.

I use various extensions for Visual Studio Code. They add a million features, but these are the ones I find most useful:

I prefer to view the current status of my checkout in the sidebar of my code editor than on the command line.

It's easier to view a diff of a file and decide whether to stage or rollback changes in a GUI. With most GUIs you can even select individual lines of code and revert or stage them.

I like how Commit and Push and Pull are a single "Commit & Sync" button in Visual Studio code. Similarly there's a simple "Sync" button in the status bar.

Speaking of the status bar - it also has a counter for commits that need to be pushed or pulled. And it tells you what branch you're currently on. And whether you have uncommitted changes. Handy.

I find the GUI equivalent of git log --graph is significantly easier to understand when the graph is drawn with nice vector lines instead of ASCII art.

Finally - I don't just use raw git, I also use extensions like pull requests, and I create branches for issue numbers. I have an extension that shows pull requests in Visual Studio Code and also shows issues assigned to me, with a one click "Start Working" button to create a branch named after the issue and change the issue status to In Progress. And when I'm finished working on it, there's a button for that too.

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.

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.

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

If you're already comfortable working in the shell, you should check out tig. It's not as fully featured as the other clients named here, but it's an excellent viewer nevertheless.

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

Github desktop is very functional, I use it all the time