←back to thread

Jujutsu for everyone

(jj-for-everyone.github.io)
434 points Bogdanp | 3 comments | 31 Aug 25 15:31 UTC | HN request time: 0.886s | source
Show context
Ericson2314 ◴[31 Aug 25 17:11 UTC] No.45084874[source]▶
I want to read "Jutustsu for Git experts"

For example, will the committing of conflicts (a good idea I agree), mess up my existing git rerere?

Also I agree that the staged vs unstaged distinction is stupid and should be abolished, but I do like intentionally staging "the parts of the patch I like" while I work with git add -p. Is there a a lightweight way to have such a 2-patch-deep patch set with JJ that won't involve touching timestamps unnecessarily, causing extra rebuilds with stupid build systems?

replies(3): >>45085487 #>>45088024 #>>45088309 #
steveklabnik ◴[31 Aug 25 23:30 UTC] No.45088024[source]▶
1. You wouldn’t use git rere with jj, so that’s sort of a nonsequitor.

2. You treat @ (the working copy) like the staging area, @- (the parent of the working copy) as the commit you’re working on, and then jj squash -i (“interactive”) the parts of the diff you want back into @.

replies(2): >>45088172 #>>45089207 #
didibus ◴[01 Sep 25 03:34 UTC] No.45089207[source]▶
I think the issue for me will be that IDEs tend to show diff with head, I'm not even sure you can configure them otherwise.
replies(1): >>45089655 #
1. steveklabnik ◴[01 Sep 25 05:12 UTC] No.45089655[source]▶
I’m not a big “VCS in an IDE” person but visualjj works for vs code, and there’s other plugins to, I hear. If your IDE isn’t configurable and assumes certain things then it might not work, yeah.
replies(1): >>45096027 #
2. didibus ◴[01 Sep 25 19:53 UTC] No.45096027[source]▶
I don't mean VCS UI, I mean that in the project view and when viewing source files, the editor highlights added, removed and changed lines and normally if you click on it it shows the diff at that code block.

Generally IDEs will be diffing against head or staging and it's not very configurable.

replies(1): >>45096651 #
3. steveklabnik ◴[01 Sep 25 21:12 UTC] No.45096651[source]▶
Yeah, visualjj does that stuff. But for sure, if your IDE isn’t configurable there’s not much that can be done.