Martin von Zweigbergk 24a512683b revset: add a revset function for finding commits with conflicts ... This adds `conflict()` revset that selects commits with conflicts. We may want to extend it later to consider only conflicts at certain paths.		2023-04-06 16:46:21 -07:00
..
design	docs/technical: add aspirational Git submodules doc	2023-04-03 12:58:17 -07:00
technical	docs: mention that the "view" object knows about all workspaces	2022-12-08 17:30:29 -08:00
branches.md	templater: indicate if branch needs to be pushed to a remote	2022-11-09 22:44:55 -08:00
code-of-conduct.md	Boilerplate for new Google open source project	2020-12-11 23:37:59 -08:00
config.md	cli: add ui.log-word-wrap option	2023-03-11 12:01:17 +09:00
config.toml	Update docs/config.toml with new way to show relative timestamps	2023-02-15 21:26:14 -08:00
conflicts.md	docs: indent conflict marker examples to not confuse tools	2022-12-12 16:20:40 -08:00
contributing.md	cargo: update MSRV to 1.64	2023-03-17 22:44:29 -07:00
git-comparison.md	Rename jj touchup to jj diffedit	2022-12-21 08:15:06 -08:00
git-compatibility.md	docs: add note that co-located mode helps when tools expect a Git repo	2023-03-29 11:25:47 -07:00
github.md	Add docs on how to use GitHub CLI in repos that aren't co-located	2023-04-05 21:22:49 -06:00
operation-log.md	operation-log.md: Give a brief description of @, +, -	2023-02-18 22:42:51 -08:00
related-work.md	docs: hyphenate "working-copy" when used as a compound modifier	2022-08-25 18:08:36 -07:00
revsets.md	revset: add a revset function for finding commits with conflicts	2023-04-06 16:46:21 -07:00
templates.md	templater: add "parents" keyword in place of "parent_commit_ids"	2023-03-24 12:17:38 +09:00
tutorial.md	Switch graph node to use ◉ for commit instead of ●	2023-04-02 23:15:37 -07:00
working-copy.md	workspace: add a root subcommand to print the workspace root path	2023-01-24 16:53:54 +01:00