I've looked at Magit and indeed Emacs is a blocker as it's not something I'd like to pick up and maintain. I am using Fork as my primary Git GUI and am pretty happy with it. Lazygit and tig cover the few use-cases which Fork does not cover.

I am not someone to recommend VSCode, but if you are already using it, you could check out edamagit. I think in the Vim world there is also some equivalent.

Run spacemacs in ‘evil mode’ so you can use Vim!

The best gut GUI is GitUp: https://gitup.co/

Magit is not even close to be on the same level.

Any insane operation you want at your fingertips.

It's Mac-only. That's a pretty serious limitation for a modern Git tool.

I upvoted you because you were unfairly downvoted. I don't even use a Mac any more after 20 years of exclusively using them but it's actually hilarious how bad magit is compared to this. It's all well and good making the most of limitations that are self imposed but people need to remember to look outside their own bubble.

> I don't even use a Mac any more after 20 years

So the software is mac-only, you haven't used a mac in over 20 years so you haven't used this software and yet... you claim it's better than magit?

i mean, it's very dishonest at best.

> you haven't used a mac in over 20 years

Not what he said. You misparsed.

The claim was that its GUI is better than Magit's, following this claim: "Magit is absolutely the best Git GUI ever."

It may be prettier looking. I've seen many Git GUIs that are prettier than Magit.

But none of them that I've tried have ever come close to the workflow.

I can stage and unstage individual hunks, do complex interactive rebases, squash commits, break apart commits, etc. much faster in Magit than I can in other Git GUIs.

Maybe you're hung up on the "G" part; perhaps I should have just said "UI" rather than "GUI".

So no, I haven't tried that one because it's Mac only, but I'm not really seeing from the screen recordings the kind of workflow that I find so powerful in Magit.

> I can stage and unstage individual hunks, do complex interactive rebases, squash commits, break apart commits, etc. much faster in Magit than I can in other Git GUIs.

I can do all that pretty fast in GitUp, too. Since most of the commands there have quick keyboard shortcuts.

My most common workflow besides staging anything is (to make sure history is clean):

- split up a commit (add/remove files or hunks if the commit contains stuff that should go into another commit) - move new commit up/down the branch (doesn't require interactive rebase in GitUp) - squash up/down

(undo/redo from time to time)

As far as I understand, Magit doesn't offer anything in that regard except the good old interactive rebase [1]. In GitUp moving commits is (u)p/(d)own and (s)quash with parent

> Maybe you're hung up on the "G" part; perhaps I should have just said "UI" rather than "GUI".

The distinction doesn't matter. The keyword in both GUI and UI is User. As a user I found GitUp to be a much better tool than Magit. Though Magit does probably allow for more very advanced usage most people don't do. [2]

However, actual useful usage like I described above? Ooh boy, no one does it except GitUp for some reason.

[1] I only have this blog post to confirm https://www.howardism.org/Technical/Emacs/magit-squashing.ht...

[2] There's another downside to GitUp: it's very slow on repos with huge histories. Probably due to the git library it's using.

Isn’t this just something that any IDE has built-in these days? Maybe I’m missing something, but how is this fundamentally different from the built-in git timeline view from something like VSCode or Jetbrains?

> Isn’t this just something that any IDE has built-in these days?

In most IDEs I feel that Git integration is an awkward badly integrated afterthought. They are also very much tied to the whatever IDE offers them in terms of available shortcuts, layouts, controls etc. (this applies to Magit, too).

Some of my idiosyncratic usage I developed with GitUp doesn't even exist in most (all?) Git tools: https://news.ycombinator.com/item?id=47329489 (see my most common workflow)

Good tools can improve your workflow for sure, but it's easy enough to keep a clean history with a handful of git commands. There are two main reasons people don't do so: 1. they don't know the commands yet or 2. they just don't care (and are in an environment where there's no incentive to care).

The kind of person who would try a tool like Magit and use it to discover git would have found a different route if Magit didn't exist. The type of person who doesn't care isn't going to learn something just because a tool is available.

Magit is more than a shortcut for command avoidance. It helps surface conflicts and edge cases during complex rebases and fixups, especially on big feature branches, making problems visible earlier. Relying on muscle memory alone can lead to mistakes, and using better tooling can limit the fallout when that happens.

Peculiarly, having used Emacs for a decade as my main editor, and Git for much more than that, I never could get used to Magit.

Maybe it's due to muscle memory from my CLI Git setup (nothing special, just some aliases, scmpuff, delta, etc.), or Magit forcing you into its own quirky UI, but it never clicked for me. For 99% of things I use Git for, I don't have any issues with my workflow, nor wish to improve it. For the other (very) rare occasions, I can always ask an LLM to help me figure out the right command.

This is also why I don't see any value in Jujutsu either, or any of the GUI/TUI wrappers. The Git CLI porcelain with some minor customizations just hasn't been a problem I need solving.

> Unfortunately, for most people the fact that it's part of Emacs is a blocker.

OT but i've learned the hard way not to push people into emacs.

a few years ago i made the very stupid mistake of pushing some colleague to trying/learning emacs and then i found myself having to explain the same person everything as well as fix his elisp code from his ~/.emacs .

Reality is, i didn't want to have that role and that colleague wasn't interested in gnu emacs in the first place.

That was a very stupid mistake on my side.

Nowadays i just say things like "yeah it's magit, an emacs plugin" or "ah yeah, it's nice because you spend some time learning it and then you can bring it over from company to company, no licenses involved or other annoyances".

Some people are intrigued, most other absolutely aren't... And it's fine.

Surely the mistake here is conflating "learning Magit" with "learning Emacs"? I can run Java applications while knowing nearly nothing about the JVM. The same is true for applications based on Emacs.

Magit is not an "application based on Emacs", it's an extremely powerful git plugin for someone who is already using Emacs. If you're not using Emacs, it would be crazy to fire up Magit just to do a git commit or rebase. Even the fact that you'd have to learn Emacs' extremely idiosyncratic keyboard shortcuts, and even keyboard shortcut help (what do you mean "save is C-x C-s?" what does that even mean?) is a huge problem not worth the effort.

And I'm saying this as someone who has exclusively programmed in Emacs with Magit for the last 5 years in my job.

> If you're not using Emacs, it would be crazy to fire up Magit just to do a git commit or rebase.

What makes you say that?

> what do you mean "save is C-x C-s?" what does that even mean?

Magit never asks you to C-x C-s save anything. Magit has its own independent set of discoverable keybinds.

One does not simply use Emacs.

I simply used Emacs for 25 years, avoiding editing .emacs entirely

Only in the past years have I started customizing it

My attraction to Emacs is stability and I can use it in text or GUI mode.

Many editors have come and gone in that time, many employers insist I use this or that piece of over designed, under done GUI. When I have the chance, back to Emacs

Personally, I'm not a Git magician, but I prefer the Git CLI for most operations.

Only exception is resolving conflicts.

The most important point for every gut IDE integration to me is that it cleanly maps to the file system and CLI state.

Staging single lines or hunks is also much easier in a TUI/GUI. I wouldn't even know how to do it with just git.

git add -p

Operates on hunks, which may at times be multiple lines that cannot be split further

You can edit a hunk with `e`. Clunky but it works.

In a conversation about magit, this is comparing jumping off a sidewalk to powered flight.

oftentimes splitting the hunks with `s` is enough.

> Magit is absolutely the best Git GUI ever.

But it isn't graphical :-P.

Personally i've been often looking for an opensource Git GUI front end but couldn't find anything i'd like. My points of reference of decent tools -ignoring the underlying tech- are Perforce and TortoiseSVN under Windows and Fuel[0] (for Fossil) and KDESVN under Linux.

Perforce and Fuel are the two i like the most, followed by KDESVN and Tortoise. But since i'm on Linux and i stick with opensource projects, Perforce and Tortoise are out, leaving me with Fuel and KDESVN. I'm using KDESVN for a few projects where i don't care about external collaboration and want to store many binary files (which Subversion does it better that Git IMO), though KDESVN is very primitive and limited in what it supports (it doesn't support shelving at all, for example - in fact for anything beyond commit and checking the history you probably need to use the cli tool). I do not use Fossil much nowadays but i used it a lot in the past so i have a bunch of repositories in it, for which i use Fuel. Fuel is unfortunately not being developed anymore, though since it is opensource it doesn't matter much (which is a reason why i ignore anything non-opensource, i know there are some decent proprietary Git clients but for me they might as well not exist).

I think at some point i'll grab libgit2 and make something using Lazarus. Unlike libsvn, which seems to be made in hell, libgit2 seems very sane and shouldn't be terribly hard to make something usable out of it.

In the meanwhile i use a combination of git cola, gitgui and gitk though they all feel like a hodgepodge of barely thought random features thrown in together (and i hate that they all want to impose their own idea of how i should format a message -especially git cola- which of course aren't identical between of them and aren't even close how i'd like to format the messages myself).

https://fuel-scm.org/fossil/index

> Magit is absolutely the best Git GUI ever

Not even close. Claude and codex are the best git gui.