ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

FAQ: Fix typo in and edit one of the entries

Browse source
This commit is contained in:
Ilya Grigoriev 2024-02-03 22:02:34 -08:00
parent 3d1ce5b6fd
commit 0773cefe32
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
docs/FAQ.md
View file

@ -33,7 +33,7 @@ revision visible again.
See [revsets] and [templates] for further guidance. See [revsets] and [templates] for further guidance.
### `jj` is said to record the working after `jj log` and every other command. Where can I see these automatic "saves"? ### `jj` is said to record the working copy after `jj log` and every other command. Where can I see these automatic "saves"?
Indeed, every `jj` command updates the current "working-copy" revision, marked Indeed, every `jj` command updates the current "working-copy" revision, marked
with `@` in `jj log`. You can notice this by how the [commit ID] of the with `@` in `jj log`. You can notice this by how the [commit ID] of the
@ -41,20 +41,21 @@ working copy revision changes when it's updated. Note that, unless you move to
another revision (with `jj new` or `jj edit`, for example), the [change ID] will another revision (with `jj new` or `jj edit`, for example), the [change ID] will
not change. not change.
If you expected to see a historical view of your working-copy changes in If you expected to see a historical view of your working copy changes in the
`jj log`, as a chain in a parent-child relationship, this is not the case. parent-child relationships between commits you can see in `jj log`, this is
Instead, each commit gets amended and the commit ID changes. simply not what they mean. What you can see in `jj log` is that after the
working copy commit gets amended (after any edit), the commit ID changes.
You can see the history of these changes using `jj obslog`. This will show the You can see the actual history of working copy changes using `jj obslog`. This
history of the commits that were previously the "working-copy commit", since will show the history of the commits that were previously the "working-copy
the last time the change id of the working copy commit changed. The obsolete commit", since the last time the change id of the working copy commit changed.
changes will be marked as "hidden". They are still accessible with any `jj` The obsolete changes will be marked as "hidden". They are still accessible with
command (`jj diff`, for example), but you will need to use the commit id to any `jj` command (`jj diff`, for example), but you will need to use the commit
refer to hidden commits. id to refer to hidden commits.
You can also use `jj obslog -r` on revisions that were previously the You can also use `jj obslog -r` on revisions that were previously the
working-copy revisions. Use `jj obslog -p` as an easy way to see a commit's working-copy revisions (or on any other revisions). Use `jj obslog -p` as an
evolution. easy way to see the evolution of the commit's contents.
### Can I prevent Jujutsu from recording my unfinished work? I'm not ready to commit it. ### Can I prevent Jujutsu from recording my unfinished work? I'm not ready to commit it.