Defeating Git Rigour Fatigue with Jujutsu • Hacker News Board

Re: Defeating Git Rigour Fatigue with Jujutsu

#191

Post by kccqzy » Tue, May 26, 2026, 10:03 PM UTC

kccqzy wrote: post #180

krackers wrote: post #179

Earlier quoted context omitted.

Last i checked that only disables tracking of new files, it doesn't do anything to prevent the "auto-amend" behavior for modified files.

Honestly it took me about two days before I just got used to it. You can change `git checkout blah` into `jj new blah`.

Oh and one more thing I forgot: in git a lot of operations require you to have a clean checkout. Otherwise you have to stash your changes first before doing that operation. With jujutsu’s model, there is no stashing. Every edit is already part of a commit. Therefore you can totally do rebases even when you are in the middle of some other unrelated change.

Re: Defeating Git Rigour Fatigue with Jujutsu

#192

Post by jezzamon » Thu, May 28, 2026, 1:28 PM UTC

mercenario wrote: post #190

jezzamon wrote: post #164

Earlier quoted context omitted.

If you do want to solve this, here's two thoughts on how you can deal with it. First: don't try to edit jj changes. Always work on a new change and then squash that in to the parent. You think of that top level change as your working space. From there, the simplest way is to just always use 'jj commit -i' and 'jj squash -i' to create change ids with your work. Then if you want to have your changes move around with yo…

could you tell which UI tool is that where you can drag commits visually?

It's internal to my company, unfortunately! Otherwise I would've mentioned it

Re: Defeating Git Rigour Fatigue with Jujutsu

#193

Post by Balinares » Thu, May 28, 2026, 7:45 PM UTC

vaylian wrote: post #152

Balinares wrote: post #146

Earlier quoted context omitted.

A series of piecemeal self-contained changes is much easier to wrap your brain around comprehensively enough to detect logic issues. I started doing exactly this and it's been invaluable.

How does this work for you UX-wise? Do you use github? Do you and your collaborators select each commit individually inside a pull request?

We're a GitLab shop. The GitLab UI lets you read a PR commit by commit.