Skip to content

Improve clarity in the squash workflow intro #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gthb wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Improve clarity in the squash workflow intro #112

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/real-world-workflows/the-squash-workflow.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ and contrasting the two is interesting.

The workflow goes like this:

1. We describe the work we want to do.
2. We create a new empty change on top of that one.
3. As we produce work we want to put into our change, we use `jj squash` to move
changes from `@` into the change where we described what to do.
1. We describe the work we want to do, in the current change (call it `C`).
2. We create a new empty change (now called `@`) on top of `C`.
3. As we produce work, we use `jj squash` to move that work from `@` into `C`.

In some senses, this workflow is like using the `git` index, where we have our
list of current changes (in `@`), and we pull the ones we want into our commit
Expand Down