Original post on mathstodon.xyz

Jujutsu PSA:

Running `jj st` ¹ may change the state of your repository, even though it looks like it should be a read-only command. Consider the following steps:

1. Create a file xyz in your repository
2. Run `jj st`
3. Add xyz to .gitignore

If you omit step 2., the outcome changes. Namely […]

Original post on social.linux.pizza

If you haven't tried it yet, I definitely recommend checking Jujutsu Version Control System.

I literally heard about it two days ago, started reading through some tutorials, and already feel like this is something exciting and new in the VCS world. You can use it locally on any git repository […]

Screenshot showing Kaleidoscope app release notes, with a red box drawn around the following text to emphasize it: “Basic Integration with the Jujutsu (jj) version control system. • Jujutsu is listed in the Integration window with information how to set up Kaleidoscope as diff and merge tool with jj. • Changesets opened through jj diff or jj interdiff now show a bit more context.”

Ooooooh! First #JujutsuVCS integration in @kaleidoscope.app dropped in their 6.1 release! #jj

GitHub - chriskrycho/bbedit-jj-syntax Contribute to chriskrycho/bbedit-jj-syntax development by creating an account on GitHub.

For the tiny overlap between the circles that are “people who use BBEdit” and “people who use #jjVCS”: syntax highlighting for #JujutsuVCS commit messages in BBEdit! 🎉 github.com/chriskrycho/...

Original post on infosec.town

Toying with the idea of trying #jj for Spades. I don't really work on a team, but I still try to not break things for other people nonetheless (like links). The key is I want my Git commit messages in Codeberg to remain clean, readable, and conventional, and I want to not break links (but have […]

I wrote this up in a slightly longer blog post to show off a few cool examples, including describing all the commits on top of trunk with no description, or all the commits which touch a given file, and so on: v5.chriskrycho.com/notes/jj-tip...

#jjVCS #jujutsuVCS #jj

jj vcs seems really cool, but the current authentication situation is rough. Once it gets ironed out a bit I'll definitely give it a serious try.

#JujutsuVCS #jj-vcs #jj

jj tip: Squash Changes From Across a Revset — Sympolymathesy, by Chris Krycho You can use `jj squash --from` with a revset to move changes out of a set of commits into another commit. Handy for breaking up changes into small PRs!

Another great #JujutsuVCS trick I learned this morning: you can use #jj squash with a revset and a fileset to move changes out of a whole set of commits into another commit. 🤯 *Super* handy when you want to split out changes into multiple PRs. v5.chriskrycho.com/notes/jj-ti...

Jujutsu docs

I’m calling it now: this is the year a bunch of you are going to switch to using #JujutsuVCS, because it’s awesome. I’m going to keep doing my best to make #jj happen—hopefully lots more posts/videos/etc.

Some of you are hacking on side projects on vacation. Try it out! jj-vcs.github.io/jj/latest/

Deferred Conflict Resolution in Jujutsu — Sympolymathesy, by Chris Krycho Doesn’t that just make things worse somehow?

I wrote yesterday a bit about how deferred conflict resolution works in #JujutsuVCS – a thing that leaves a lot of new #jj users (including me when I first started!) asking, “Wait, why would I even want that?!? Isn’t that *worse*?” Spoilers: actually it’s better! v5.chriskrycho.com/journal/def...

Introduction - Steve's Jujutsu Tutorial

Working thru @steveklabnik.com's #JujutsuVCS tutorial today.
"An interesting thing that I've noticed while using jj is that sometimes things feel the same, but backwards."
An inversion much like ownership in #RustLang and "select -> modify" in #Kakoune
steveklabnik.github.io/jujutsu-tuto...

Why the Jujutsu posts are all about differences from Git — Sympolymathesy, by Chris Krycho When writing about something which invites obvious comparisons to a “peer” in its category, it is natural to emphasize what is different and novel.

I wrote about why all the posts about #JujutsuVCS are all differences from Git, and how this relates to a more general issue when talking about new tools/ideas/etc. v5.chriskrycho.com/notes/why-t...

Jujutsu Megamerges and jj absorb — Sympolymathesy, by Chris Krycho A really handy approach for splitting apart changes into multiple branches but working on their combination.

I wrote about the #JujutsuVCS “megamerge” workflow and #jj absorb. As I put it at the end of the post: it’s like my superpowers got superpowers! v5.chriskrycho.com/journal/juj...

[automated post: I remain away for Advent 🕯️ – see you in Christmastide]

jj tip: ignore gh-pages by default — Sympolymathesy, by Chris Krycho I defined a revset and tweaked my defaults in Jujutsu so now I never have to think about `gh-pages` unless I actively want to.

I wrote about using #JujutsuVCS revsets to make my life easier again—this time, talking about how to never, ever have to think about the `gh-pages` bookmark/branch again unless I *want* to. v5.chriskrycho.com/notes/jj-ti...

[automated post: I remain away for Advent 🕯️ – see you in Christmastide]

New Tool: jj-gpc — Sympolymathesy, by Chris Krycho Making nicer branch names on the fly.

Some fun Thanksgiving holiday hacking—I made a little LLM-based tool to generate branch names for me when I have an anonymous branch in #JujutsuVCS that I want to push to some Git forge or other, and want a better name than `push-tskzrxpsrmox`. 😅

v5.chriskrycho.com/journal/new-... has the details!

Status: I will not shave the yak that is implementing Git submodule integration in #JujutsuVCS just so I can have a nicer time working on tweaks to the #Rust repo’s use of submodules for _The Rust Programming Language _ integration. I will not shave the yak that is… 😂

If you have ever had to merge two Git repo histories, it is a mildly arcane and annoying process. With #JujutsuVCS, it is… not:

1. Add the second repo as a remote.
2. Make a new change (which is how jj does merges) with parents from both repos.
3. There is no step three.

🤯🚀

A Better Merge Workflow with Jujutsu | ofcrse by Benjamin Tan A merge workflow for activating multiple branches simultaneously using Jujutsu, an alternative VCS to Git.

More excellent #JujutsuVCS material—this one with a walkthrough of a super interesting technique you can use with branches in jj that makes keeping on top of parallel streams of work *way* easier than it is in Git: ofcr.se/jujutsu-merg...