-
Notifications
You must be signed in to change notification settings - Fork 343
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
docs: prefer new revset operator
::
over deprecated :
Now that we're very close to a release, it should be fine to use the new syntax in our documentation. This effecttively backs out 37436f7.
- Loading branch information
1 parent
bafd1b5
commit d047512
Showing
4 changed files
with
17 additions
and
17 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() & (mine() | committer([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 |
---|---|---|
|
@@ -160,7 +160,7 @@ called the "root commit". It's the root commit of every repo. The `root()` | |
function 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. | ||
|
@@ -346,7 +346,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 | ||
|