Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions cli/src/commands/log.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion docs/glossary.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ call that a [divergent change](#divergent-change).
## Divergent change

A divergent change is a [change](#change) that has more than one
[visible commit](#visible-commits).
[visible commit](#visible-commits). These changes are displayed with a `??`
after their change ID.

## Head

Expand Down
8 changes: 8 additions & 0 deletions docs/guides/divergence.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@
A [divergent change] occurs when multiple [visible commits] have the same change
ID.

These changes are displayed with a `??` after their change ID:

```shell
$ jj log
@ mzvwutvl?? test.user@example.com 2001-02-03 08:05:12 29d07a2d
│ a divergent change
```

Normally, when commits are rewritten, the original version (the "predecessor")
becomes hidden and the new commit (the "successor") is visible. Thus, only one
commit with a given change ID is visible at a time.
Expand Down
Loading