ok/jj
1
0
Fork 0
forked from mirrors/jj
jj/docs
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
branches.md
code-of-conduct.md
config.md cli: add ui.log-word-wrap option 2023-03-11 12:01:17 +09:00
config.toml
conflicts.md
contributing.md cargo: update MSRV to 1.64 2023-03-17 22:44:29 -07:00
git-comparison.md
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
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