Skip to content

Commit de3e37c

Browse files
rikingsteveklabnik
authored andcommitted
revsets: mention squash into
This should really be introduced in "The Squash Workflow" to explain how it has the exact same power as the Edit Workflow, but I'm not up for that much writing right now
1 parent a0c6914 commit de3e37c

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/branching-merging-and-conflicts/revsets.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ example, remember how in the squash workflow, we would move the contents of
2828
the working directory into the parent change? Well, the `-` operator refers to
2929
the parent of a given revision, and `@` is the change referring to the current
3030
working directory, so we might say "we squashed the contents of `@` into `@-`.
31-
And in fact, `jj squash` is short for `jj squash -r @`. There are many operators,
32-
including, but not limited to:
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:
3334

3435
* `x & y`: changes that are in both x and y
3536
* `x | y`: changes that are in either x or y

0 commit comments

Comments
 (0)