Skip to content

Commit 07e1ddc

Browse files
btssteveklabnik
authored andcommitted
chore: Standardize on term 'working copy'
1 parent f9327d7 commit 07e1ddc

File tree

4 files changed

+16
-17
lines changed

4 files changed

+16
-17
lines changed

src/advanced/simultaneous-edits.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,10 @@ Check out this `jj log`:
211211
212212
Glorious!
213213

214-
So now our working directory has all of our changes in it. We can make changes,
215-
and then `jj squash` them into the appropriate branch. If we decide we want a
216-
new change at the head of any of these branches, we'll need to use a rebase,
217-
but it's not too bad:
214+
So now our working copy has all of our changes in it. We can make changes, and
215+
then `jj squash` them into the appropriate branch. If we decide we want a new
216+
change at the head of any of these branches, we'll need to use a rebase, but
217+
it's not too bad:
218218

219219
```console
220220
> jj new z -m "second 80% done"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ working copy, and if that's in conflict, it has to be fixed or the next commit
211211
is nonsense. We'll talk about how `jj` handles conflicts shortly, but as I
212212
said before: rebases *always* succeed in `jj`. So this change is quick: it's
213213
only modifying information in the repository, not touching any of the files we
214-
have in our working directory. This also means our working directory hasn't
215-
changed, so `@` is in the same place it was before the rebase.
214+
have in our working copy. This also means our working copy hasn't changed, so
215+
`@` is in the same place it was before the rebase.
216216

217217
Some commands do move `@` by default, like `jj new`. This is because if you're
218218
creating a new change, you probably want to start working on it. But it has a

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

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,11 @@ are other examples of symbols.
2525

2626
Operators let you describe more complex relationships between changes. For
2727
example, 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

9695
Revsets are very powerful, and you'll learn some useful ones as you explore
9796
more. At some point, we'll even talk about how to create custom aliases for

src/hello-world/creating-new-changes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Working copy : puomrwxl 01a35aad (empty) (no description set)
2121
Parent commit: yyrsmnoo ac691d85 hello world
2222
```
2323

24-
Nice, a clean working directory: all of our changes were made in `yyrsmnoo`, and
24+
Nice, a clean working copy: all of our changes were made in `yyrsmnoo`, and
2525
we're starting this change fresh.
2626

2727
We now technically have a very primitive, but near-complete, workflow. That's

0 commit comments

Comments
 (0)