-
Notifications
You must be signed in to change notification settings - Fork 284
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
docs: revert to using revset operator
:
instead of ::
Since our latest release doesn't support `::`, we shouldn't tell the user to use it. This commit should be backed out we've released jj 0.9.0.
- Loading branch information
1 parent
48b1a1c
commit 21b6978
Showing
4 changed files
with
18 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -148,7 +148,7 @@ remote | |
Log all remote branches, which you authored or committed to | ||
`jj log -r 'remote_branches() & (committer([email protected]) | author([email protected]))'` | ||
Log all descendants of the current working copy, which aren't on a remote | ||
`jj log -r '::@ & ~remote_branches()'` | ||
`jj log -r ':@ & ~remote_branches()'` | ||
|
||
## Merge conflicts | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -159,7 +159,7 @@ called the "root commit". It's the root commit of every repo. The `root` symbol | |
in the revset matches it. | ||
There are also operators for getting the parents (`foo-`), children (`foo+`), | ||
ancestors (`::foo`), descendants (`foo::`), DAG range (`foo::bar`, like | ||
ancestors (`:foo`), descendants (`foo:`), DAG range (`foo:bar`, like | ||
`git log --ancestry-path`), range (`foo..bar`, same as Git's). There are also a | ||
few more functions, such as `heads(<set>)`, which filters out revisions in the | ||
input set if they're ancestors of other revisions in the set. | ||
|
@@ -345,7 +345,7 @@ $ jj new -m ABC; printf 'A\nB\nc\n' > file | |
Working copy now at: 6f30cd1fb351 ABC | ||
$ jj new -m ABCD; printf 'A\nB\nC\nD\n' > file | ||
Working copy now at: a67491542e10 ABCD | ||
$ jj log -r master::@ | ||
$ jj log -r master:@ | ||
@ mrxqplykzpkw [email protected] 2023-02-12 19:38:21.000 -08:00 b98c607bf87f | ||
│ ABCD | ||
◉ kwtuwqnmqyqp [email protected] 2023-02-12 19:38:12.000 -08:00 30aecc0871ea | ||
|