@@ -25,12 +25,11 @@ are other examples of symbols.
2525
2626Operators let you describe more complex relationships between changes. For
2727example, remember how in the squash workflow, we would move the contents of
28- the working directory into the parent change? Well, the ` - ` operator refers to
29- the parent of a given revision, and ` @ ` is the change referring to the current
30- working directory, so we might say "we squashed the contents of ` @ ` into ` @- ` .
31- And in fact, ` jj squash ` is short for ` jj squash -r @ ` or equivalently `jj
32- squash --from @ --into @-`. There are many operators, including, but not
33- limited to:
28+ the working copy into the parent change? Well, the ` - ` operator refers to the
29+ parent of a given revision, and ` @ ` is the change referring to the current
30+ working copy, so we might say "we squashed the contents of ` @ ` into ` @- ` . And
31+ in fact, ` jj squash ` is short for ` jj squash -r @ ` or equivalently `jj squash
32+ --from @ --into @-`. There are many operators, including, but not limited to:
3433
3534* ` x & y ` : changes that are in both x and y
3635* ` x | y ` : changes that are in either x or y
@@ -88,10 +87,10 @@ decent revset for larger repositories:
8887$ jj log -r ' @ | ancestors(remote_bookmarks().., 2) | trunk()'
8988```
9089
91- This will show the history from the working directory , some detail about remote
92- branches, as well as the trunk. What's good varies between what you're trying to
93- do and what your repository looks like, so experiment with some of this stuff
94- to find something that works well for you.
90+ This will show the history from the working copy , some detail about remote
91+ branches, as well as the trunk. What's good varies between what you're trying
92+ to do and what your repository looks like, so experiment with some of this
93+ stuff to find something that works well for you.
9594
9695Revsets are very powerful, and you'll learn some useful ones as you explore
9796more. At some point, we'll even talk about how to create custom aliases for
0 commit comments