Defeating Git Rigour Fatigue with Jujutsu
1–10 of 193 posts
Re: Defeating Git Rigour Fatigue with Jujutsu
#2I don't get why people like jujutsu. I tried it for a while but I work with a quite a few people in the same repo and I need easy named branches that keep up with commits. For all the many problems in git, branches are dead easy. That was the big innovation over svn at the time.
Last time I tried jj, branches were an extremely laborious process to keep up to date. I don't see how people that aren't working alone can work with that. I have numerous branches in flight at any given time, and my colleagues do as well. The idea of manually keeping them pointed at the right commit is just nuts.
Maybe they've fixed that astonishing choice since then, and I'd give things another go if they did. But branches and worktrees are how I operate.
Regarding the article, I have no idea what is going on as I'm red-green color deficient.
Re: Defeating Git Rigour Fatigue with Jujutsu
#3So... git rebase -i?
Re: Defeating Git Rigour Fatigue with Jujutsu
#4I have been walking some newer programmers through Git recently, so this topic is fresh on my mind. The commands in the blog post do not look friendlier or even different.
Re: Defeating Git Rigour Fatigue with Jujutsu
#5So: Squash everything together then pick each component out by squash -i to an empty commit.
Seems straightforward, wouldn’t call it special
Re: Defeating Git Rigour Fatigue with Jujutsu
#6So... git rebase -i?
Definitely not. Switch to a previous commit, make edits, changes propagate into the future commits (including into a git repo if you wish [1])
Jj is not git and is not a git tool, it just (thankfully) uses git as a backend, so you can still carry on with the rest of the world.
Re: Defeating Git Rigour Fatigue with Jujutsu
#7So: Squash everything together then pick each component out by squash -i to an empty commit. Seems straightforward, wouldn’t call it special
I think jj will never gain momentum because people only have a git mental model at this point, so won't be able to effectively reason about jj.
Re: Defeating Git Rigour Fatigue with Jujutsu
#8So... git rebase -i?
Definitely not. Switch to a previous commit, make edits, changes propagate into the future commits (including into a git repo if you wish [1]) Jj is not git and is not a git tool, it just (thankfully) uses git as a backend, so you can still carry on with the rest of the world. [1] https://news.ycombinator.com/item?id=47765759
[deleted]
Re: Defeating Git Rigour Fatigue with Jujutsu
#9> `absorb` assigns the changes based on whichever previous commit most recently touched those files, which sometimes doesn't actually correspond to which commit should own these particular changes.
I’m pretty sure `jj absorb` (and its predecessors, `git-absorb` [0] and `hg absorb`) are smarter than this, instead looking at the actual diffs.
Re: Defeating Git Rigour Fatigue with Jujutsu
#10I don't get why people like jujutsu. I tried it for a while but I work with a quite a few people in the same repo and I need easy named branches that keep up with commits. For all the many problems in git, branches are dead easy. That was the big innovation over svn at the time. Last time I tried jj, branches were an extremely laborious process to keep up to date. I don't see how people that aren't working alone can…
I assume you mean named branches (bookmarks in jj)? Because anonymous branches in jj are trivial: you just `jj new ` and you have a new branch.
Bookmarks aren’t that bad either IMO, especially with the recent addition of `jj bookmark advance`. Curious if you can say more about the particular difficulties you found keeping them up to date?