
Real-world workflows - Steve's Jujutsu Tutorial
Real-world workflows We can use jj at this point, but I wouldn't say our workflow is great. In this chapter, we're going to explore two different workflows that are popular with jj users. Like git, jj is extremely …
Hello, world! - Steve's Jujutsu Tutorial
Hello, world! Let's create a new repository with jj, and show off some basic commands. Here's what we're going to learn: How to install jj Creating a repository with jj git init Viewing the current status …
Introduction - Steve's Jujutsu Tutorial
Introduction Hi there, I'm Steve. This is a tutorial for Jujutsu—a version control system. This tutorial exists because of a particular quirk of mine: I love to write tutorials about things as I learn them. This …
Dealing with conflicts - Steve's Jujutsu Tutorial
Dealing with conflicts When you're merging or rebasing, if your changes are incompatible with each other, you may introduce a conflict. Conflicts are often regarded as painful by users of version control …
Using jj with Gerrit - Steve's Jujutsu Tutorial
Working with Gerrit The Gerrit-based workflow prefers small commits that get reviewed individually, as "changelists" (CLs). jj is well suited for this workflow: each jj change can be a single CL which you …
The Edit Workflow - Steve's Jujutsu Tutorial
The Edit Workflow While I like the previous workflow, some people just don't. They use a workflow that adds a different command, jj edit, along with a second new command, jj next, as well as a new flag to …
Working on all of your branches simultaneously
First, we'll do some set up to have a few pull requests going on at the same time. Then we'll show you how you can develop against all of them simultaneously, and when your upstream updates, you can …
More advanced workflows - Steve's Jujutsu Tutorial
More advanced workflows The workflows we've seen in jj are different from git in the best ways. As we get a bit more advanced, there are some very impressive possibilities yet to see. This section will …
Customizing the output of various jj commands with templates
Customizing the output of various jj commands with templates Just like revsets are a functional language that allow you to describe a set of commits, templates are a typed functional language that …