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

tutorial: link to Steve Klabnik's tutorial, mention jj log -r ::

Browse source 
I was thinking of updating the tutorial in #4168, but conversations like [this
one on
Discord](https://discord.com/channels/968932220549103686/968932220549103689/1269803837070377076)
suggest that many people aren't reading it anyway.

So, this is an attempt to quickly patch up the most relevant things before the
upcoming release.
This commit is contained in:
Ilya Grigoriev 2024-08-04 17:22:54 -07:00
parent 6fc0c7bdce
commit b2123282e8
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
docs/tutorial.md
View file

@ -1,5 +1,9 @@
# Tutorial
> **Hint:** This tutorial has become somewhat out of date. Many people find
> the alternative (not quite finished) [tutorial by Steve
> Klabnik](https://steveklabnik.github.io/jujutsu-tutorial/) helpful.
This text assumes that the reader is familiar with Git.
## Preparation
@ -178,6 +182,10 @@ ancestors (`::foo`), descendants (`foo::`), DAG range (`foo::bar`, like
`git log --ancestry-path`), range (`foo..bar`, same as Git's). See
[the revset documentation](revsets.md) for all revset operators and functions.
> **Hint:** If the default `jj log` omits some commits you expect to see, you
> can always run `jj log -r ::` (or, equivalently, `jj log -r 'all()'`) to see
> all the commits.
## Conflicts
Now let's see how Jujutsu deals with merge conflicts. We'll start by making some