github/jj-vcs-jj
1
0
Fork 0
mirror of https://github.com/jj-vcs/jj.git synced 2026-07-08 18:13:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

8
docs/guides/divergence.md
View File

@@ -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.