Programming

I will install emacs on a machine just to use magit.

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'm an Emacs users, so unsurprisingly I use magit, but perhaps surprisingly I use it sparingly, using Emacs's VC most of the time.

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.

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

The cli because it is consistent everywhere and has all fearures

Lazygit.

I mostly use git from the console.

• git with a bunch of aliases for common operations and making the log pretty.
• gitk when I need a UI to browse the history
• kdiff3 as mergetool

Mostly Magit, some CLI

Off topic: day-after-day with these kinds of posts and especially the replies, I need Reddit less and less. That's a very good thing.

Magit is what allowed me to finally commit to switching to Git full time.

It's such an excellent front-end for Git that I've known numerous workmates learn Emacs just to use Magit.

Fork on windows, SourceGit on Linux, both have a similar UI layout to SourceTree, but are much faster/snappier.

I really like having a clear overview of the commit history, branches and current local state. I haven't figured out yet how to get such an "at a glance" overview in the CLI.

For advanced stuff the CLI is still very convenient.

TortoiseGit.

Through settings, I move the Show Log to the top context menu level, and it's my entry point to every Git operation.

I see a history tree to see and immediately understand commit and branch relationships and states. I can commit, show changes, diff, rebase interactive or not, push, fetch, switch, create branches and tags, squash and split commits, commit chunk-wise through "restet after commit", … And everything from a repo overview.

/edit: To add; other clients I tried never reached what I want from a UI/GUI, never reached TortoiseGit. Including IDE integrations where I'm already in the IDE; I prefer the separate better TortoiseGit.

GitButler is interesting for it's different approach, but when I tried it out the git auth didn't remember my key password. (Since trying out jj I found out it may have been due to disabled OpenSSH Service.)

Fork !!!

It's hands down the best git client.

It's free as in: sublime text or winzip where they ask you once a month if you want to pay for it but you can just select: I'm still trying it out, and it gets out of your way.

• It's got a well designed tree graph like in GitKraken except it doesn't lag
• It's interactive rebasing is as smooth as JJ / LazyGit, so you can edit/rename/reorder your commits except you don't have to have to remember CLI flags since it has its own UI
• It's lets you commit individual lines by selecting them instead of adding/removing whole hunks like Sourcetree except it isn't filled with paper cuts where a feature breaks in an annoying way for 2 years and you have to do extra steps to keep using it how you want.

And one killer feature that I haven't seen any other git clients handle: allowing me to stage only one side of the diff. As in: if I change a line (so it shows up as one removed line and one new line in git), I can decide to add the new line change while still keeping the old line.

So changing this:

doThing(1);

into this:

doThing(2);

Shows up in git as:

- doThing(1);
+ doThing(2);

But if I still want to keep doThing(1);, I don't have to go back into my code to retype doThing(1);, or do any manual copy-pasting. I can just highlight and add only doThing(2); to the staging area and discard the change to doThing(1);.

So now the code exists as:

doThing(1);
doThing(2);

Now with a one-liner example like this, we could always re-enter the code again. But for larger code changes? It's far easier to just highlight the code in the diff and say: yes to this and no to the other stuff.

And when you get used to it, it makes it really easy to split what would be large git commits into smaller related changes keeping your git history clean and easy to understand.

Is Vscode a git client?

No one take from me though idk what I'm doing when it comes to programming stuff.

Lazygit. Used gitui for a long while but lazygit has vim key bindings which is much nicer and it also seems much more stable.

CLI with some aliases for viewing commit history and branching, or less frequently an IDE plugin

I used a lot of Magit at work (it's good), as well as jujutsu and command line. Also, gitk for browsing history.

Currently I use jujutsu at home for leisure stuff and command line + git gui at work. For some workplaces, more powerful tools are just overkill.

I use plain old git for the same reasons already mentioned, but magit is the gold standard.

Fugitive, the vim / neovim plugin. It does everything the CLI does, but uses vim interfaces very effectively to enhance the experience. For example it's quite good for selectively staging changes from a file. I also like the option to open a buffer with the version of a file from any specified commit.

I also tried neogit which aims to port magit to neovim. I didn't like it as much. Partly because as far as I could tell at the time it lacked features compared to fugitive. But also because it seemed to want me to do everything through UIs in its own custom windows. Fugitive is integrated more thoroughly into vim via command mode, and special buffers.

GitKraken ❤️

If not present, vscode + gitlens

I'm a big fan of tig for visualizing the graph and looking over history (then I don't need to leave the terminal, and it's snappier, in my experience, than most full-GUI programs like Sourcetree), but for actual Git commands, I like the CLI

gitui and the plain old git cli

lazygit & gitsigns.nvim

Do Jujutsu & jjui count? The backend is still git.

cli and meld for mergetool

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.

sourcegit, fork