[tensegrist]

For what it's worth, I've been doing basically this with magit for years now, sometimes with the two-commit setup but usually just using the index plus top commit instead. It's not as slick, though, so this is on my list of things to try out when I give jj a spin eventually.

`c F` in the magit menu squashes staged changes directly into a commit in the log, and `c e` amends (which is to say squashing into the tip). So in this case I'd hit `s` to stage, and either `c e` or `c F j C-c C-c` (fixup, move one item down to get to HEAD^, confirm) — both of which are practically atomic operations for me at this point.

[bananadonkey]

Same for me originally (years past) CLI git, then magit and more recently lazygit. Identical workflows across all 3 tools, with only progressively fewer keystrokes.

[rirze]

Please. Someone create a decent jujitsu porcelain like magit before I create a shitty one myself. I would rather not subject the world to that.

[anamexis]

I have been working on a 100% vibe-coded magit-style jujitsu porcelain for neovim. I cannot emphasize "vibe-coded" enough -- I have not read a single line of code here, nor do I know much about neovim development in general. All that said, it's been working pretty well for me the last couple weeks!

https://github.com/micahbf/maju.nvim

[aneidon]

I have been using https://github.com/idursun/jjui a lot and it has been great. Not sure how it compares to magit though.

[bengesoff]

I’ve been using it too, definitely recommend!