git-stack VS magit

git-stack is the most complicated, rewriting history, detecting when a branch was squashed, etc

I used to use aliases but got frustrated with them when dealing with PRs depending on PRs, so I wrote git-stack [0]. Thought I'd share in case you'd find it useful

[0] https://github.com/epage/git-stack/blob/main/docs/reference....

For anyone interested, I've been collecting notes on various tools in this space: https://github.com/epage/git-stack/blob/main/docs/comparison... (granted the page doesn't mention git-stack since that is assumed)

Personally, I rebase my PR branches on top of each other, rather than merge. It creates a cleaner history (if your merge policy allows maintaining branch history). Tired of managing these branches, I wrote a tool to help though there are other tools in this space, like git-branchless and graphite.

git-move and git-branchless do some great stuff, I wish this wasn't focused on the performance side to distract from the real value.

What I find useful is not the performance but this line

> For example, it can move entire subtrees, not just branches

The referenced docs mention other great quality of life improvements that streamline standard workflows (e.g. deleting local PR branches when merged into upstream)

When performance does matter is when the rebase operation is a small part of a larger operation. In my related tool, git-stack [0], I rebase all branches on top of their latest upstream branches along with re-arranging and squashing fixup commits and soon other features. When automating entire workflows, having each part be fast is important for the whole to still have decent performance.

[0] https://github.com/epage/git-stack

audit for security audits - Separate from regular CI since it only matters for specific changes or when new critical issues come out.

You might be interested in git-stack that I've previously announced

Could you comment on https://github.com/epage/git-stack/issues/25 for why it helps to iterate to find the last non-conflicting commit to rebase onto?

git-stack is the result of me being tired of annoyances in the PR workflow and trying to improve it, like

Fixing branches off of branches when applying a fixup commit (not implemented yet)

Then the slowness that you're seeing is probably Windows-specific, and that's why everyone else is telling you that Magit is actually fast.

WSL might make things faster.[1] IIUC, the problem is that starting new processes is much slower on Windows than on Linux/Unix and Magit relies heavily on that. This seems to have plagued Git tooling more generally but maybe this got fixed since then.[2]

[1] https://emacs.stackexchange.com/a/58444

[2] https://github.com/magit/magit/issues/2395#issuecomment-1710...

You'll want to invest the time in learning Magit, which will change your life once you get the hang of it (and I was a heavy user of Fugitive in Vim previously!), and it's unlikely you'll find a better integration with GDB anywhere else on the planet than with Emacs, though I can't say that empirically. You just need to take the plunge and start learning it, then cut over and take the hit in productivity one day when you're feeling adventurous. You'll ultimately become far more powerful than you've ever been. Especially if you delve into elisp over time. I use Spacemacs, which is bloated and has bugs, but it has so many features that I haven't undertaken the massive endeavor to replace it from scratch yet.

> Even in this article just a few sentences after stating we should start from first principles he then jumps into the assumption of the "desktop".

Agree. Although I can see how the idea of "first principles" can be a very difficult starting point. A blank sheet of paper is a scary monster.

There's a huge breadth and depth of non-"desktop" GUIs out there, some (like smartphones) are even wildly successful. It's good to explore them for inspiration. Some of my favourites:

- Arcan (https://arcan-fe.com/about/) - I won't attempt to summarize, just dive in!

- SailfishOS (https://sailfishos.org/) - mobile UI focused on interaction through gestures / swipes; I've used it as my daily driver for a couple years.

- Speaking of mobiles, classic Nokia UIs allowed you to navigate to a specific item in the menu by pressing the corresponding digit on the dial pad. Once you learned where a particular item is, accessing e.g. your SMS inbox was extremely quick.

- Apple Watch / WatchOS (https://www.apple.com/watchos/) - I've always loved the idea of a device where one of the primary interaction methods was a wheel/dial of some sort. The watch even gives you context-sensitive tactile feedback.

- ZUIs in general (https://en.wikipedia.org/wiki/Zooming_user_interface) and the work of Jef Raskin in particular: https://en.wikipedia.org/wiki/Archy_(software) - this is the guy who helped design the Macintosh, but his other work took a radically different route.

- Magit (https://magit.vc/). Many common git operations are reduced to a couple of keystrokes; the obscure features are more discoverable, and the cumbersome procedures (such as rebasing, or staging individual hunks) become simple and intuitive. Also check out transient (https://github.com/magit/transient), which is the "UI toolkit" that powers Magit.

This can be done most comfortably with org-mode in emacs. It offers a lot of features, and they all operate on plain text. There are also nice integrations for git and languagetool, but I guess those are less exclusive.

How does this differ from https://magit.vc/ ?

I would rather see innovative tools that lessen our dependency on 50+ year old tech. This is still a glorified teletype. It uses AI to autosuggest git commands? Contrast with Magit[1], which (while it has a tiny bit of a learning curve, but also nowhere near 23M in funding) actually makes interacting with git a pleasure.

[1]: https://magit.vc

Also was using Emacs (org-mode)[https://orgmode.org] for years with (Magit)[https://magit.vc] package for git. I feel org-mod is a precursor to Roam Research, Obsidian, et al. Hit the spot for years but I wanted editing on mobile so that’s why I’m here. :)