←back to thread

I see a future in jj

(steveklabnik.com)
295 points steveklabnik | 1 comments | 22 Oct 25 17:21 UTC | HN request time: 0.21s | source
Show context
oefrha ◴[23 Oct 25 01:16 UTC] No.45677124[source]▶
I gave jj two honest tries. While first class conflicts is a cool idea, in practice I deal with staging/committing 30x more than conflict resolution, and coming from magit, using jj’s hunk split & select felt like being thrown into stone age. Plus I rebase a lot and get a lot of jj’s benefits from magit’s various rebase shortcuts already, IIRC first class conflicts was the only truly novel thing I didn’t have. For people like me who stage/commit often and judiciously I don’t think jj will beat magit until its hunk selection UX comes close.
replies(6): >>45677310 #>>45677775 #>>45678027 #>>45678524 #>>45678766 #>>45679013 #
1. CGamesPlay ◴[23 Oct 25 03:56 UTC] No.45678027[source]▶
Seriously! I found that you can still use the git index as long as you don’t run any jj command that changes git_head, and then I made an alias to make a commit from staged changes (squash-index and split-index): https://github.com/CGamesPlay/dotfiles/blob/2484f6f7d0ab302e...