Recent searches
Search options
Some updates on my #jujutsu journey. I've been daily driving it for 4 weeks now and the ux has been much more enjoyable than I thought. It really does feel like there's just a couple basic concept and everything builds up from them in a really nice way
1/3
One thing I enjoyed in particular was being able to fearlessly move between changes at any moment. I've never found the courage to learn worktrees in git as they kinda feel overwhelming, and the stash is... the stash, but with #jujutsu constantly saving your work it just works. I didn't think I would have liked the workflow where I'm always committing everything but I admit it does feel natural
2/3
On the other hand, yesterday for the first time I've had serious trouble and had to `rm -rf .git .jj`. A `jj git fetch --all-remotes` broke everything somehow. It must be said that the repo I'm working on has two upstreams and 4 total remotes, and I don't want jj to restack bookmarks from upstream branches by itself. Here a `git reset --hard upstream/branch` would work, but using `jj bookmark set branch -r branch@upstream` just resulted in #jujutsu applying a bookmark to a hidden commit
3/3
@noaccOS I've loved using it as well. Do you have suggestions about rebasing? Every time I've tried it, I keep breaking things. I think im following the correct syntax, but documentation on that feature isn't great
@redscroll For me rebasing has just worked TM.
`jj rebase --help` explains it quite well imo but tl;dr:
You select what you want to rebase and where to put it
what you can rebase: a single change (-r), a change and all its descendants (-s), a bookmark and all its predecessors[^1] (-b)
where can you put it: as a child of a change (-d), before/after changes in an existing tree (-A/-B)
[^1]: only the new changes for the destination