mirrors/jj
1
0
Fork 0
mirror of https://github.com/jj-vcs/jj.git synced 2025-12-23 06:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

docs: mention ?? means 'divergence'

Browse source 
While divergence is talked about in the documentation, few places actually
mention how divergent changes are displayed. I've added such notes to the help
out put of `jj log`, the glossary, and added an example to the guide we have on
divergence.

Fixes #6365
This commit is contained in:
Steve Klabnik 2025-12-05 16:02:36 -06:00
parent 31aae4cb26
commit 7da170d53f
4 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cli/src/commands/log.rs
View file

@ -61,11 +61,16 @@ use crate::ui::Ui;
/// [Immutable revisions] have a `◆` symbol. Other commits have a `○` symbol.
/// All of these symbols can be [customized].
///
/// Changes with a ?? after their ID are [divergent].
///
/// [Immutable revisions]:
/// https://docs.jj-vcs.dev/latest/config/#set-of-immutable-commits
///
/// [customized]:
/// https://docs.jj-vcs.dev/latest/config/#node-style
///
/// [divergent]:
/// https://docs.jj-vcs.dev/latest/guides/divergence/
#[derive(clap::Args, Clone, Debug)]
pub(crate) struct LogArgs {
/// Which revisions to show

4
cli/tests/cli-reference@.md.snap
View file

@ -1771,10 +1771,14 @@ Spans of revisions that are not included in the graph per `--revisions` are rend
The working-copy commit is indicated by a `@` symbol in the graph. [Immutable revisions] have a `◆` symbol. Other commits have a `○` symbol. All of these symbols can be [customized].
Changes with a ?? after their ID are [divergent].
[Immutable revisions]: https://docs.jj-vcs.dev/latest/config/#set-of-immutable-commits
[customized]: https://docs.jj-vcs.dev/latest/config/#node-style
[divergent]: https://docs.jj-vcs.dev/latest/guides/divergence/
**Usage:** `jj log [OPTIONS] [FILESETS]...`
###### **Arguments:**