Martin von Zweigbergk cc15ecf7c7 op log: change "resolve concurrent" to "reconcile divergent" ... "Concurrent" operations are not necessarily actually concurrent, so "divergent" seems like a better name. And "reconcile" seems like a better term for merging them, though we also sometimes use "merge".		2024-08-30 21:56:11 -07:00
..
design	cleanup: leverage BoxStream/BoxFuture type aliases	2024-06-26 11:34:52 +09:00
technical	op log: change "resolve concurrent" to "reconcile divergent"	2024-08-30 21:56:11 -07:00
branches.md	op log: change "resolve concurrent" to "reconcile divergent"	2024-08-30 21:56:11 -07:00
cli-reference.md	docs CLI Reference: make the warning in the beginning less scary	2024-06-15 20:30:40 -07:00
code-of-conduct.md
community_tools.md	Add hunk.nvim to list of community tools	2024-07-22 15:29:54 -06:00
config.md	cli: change default inline threshold of color-words diffs	2024-08-28 10:33:33 +09:00
config.toml
conflicts.md	docs: Fix example with Git conflicts markers	2024-08-02 10:36:38 -07:00
contributing.md	cli: include untracked remote branches in default immutable_heads()	2024-07-15 23:41:07 +09:00
design_doc_blueprint.md	docs: Add a Design Doc blueprint.	2024-06-30 15:37:40 +02:00
design_docs.md	docs: Add a Design Doc blueprint.	2024-06-30 15:37:40 +02:00
FAQ.md	FAQ: remove workaround for fixed bug (#2476)	2024-08-01 09:07:32 -07:00
filesets.md	cli: enable fileset by default	2024-07-24 10:49:46 +09:00
git-comparison.md	docs: add git ls-files to command comparison table	2024-08-22 22:30:31 -07:00
git-compatibility.md	docs/git-comparison.md: update the Signed_commits bullet	2024-07-17 17:12:34 +02:00
github.md
glossary.md	docs: fix another missing shell quoting around root()	2024-06-04 21:19:16 +09:00
index.md
install-and-setup.md	Added docs about installation under Gentoo Linux	2024-08-20 22:19:09 -07:00
operation-log.md	op log: change "resolve concurrent" to "reconcile divergent"	2024-08-30 21:56:11 -07:00
related-work.md
revsets.md	docs: add missing single quote to revset-aliases example	2024-08-25 23:16:29 +09:00
sapling-comparison.md	docs: explain that jj was started 3 years before Sapling announcement	2024-06-20 05:24:28 +09:00
templates.md	templater: add commit.diff().<format>() methods	2024-07-17 18:52:49 +09:00
testimonials.md
tutorial.md	cli: move "untrack" to "file" subcommand	2024-08-26 01:19:15 +09:00
windows.md	docs: update windows docs to mention minus, update minus docs	2024-06-10 11:47:34 -07:00
working-copy.md	cli: move "untrack" to "file" subcommand	2024-08-26 01:19:15 +09:00