Marie Ramlow e3fcae2152 merge_tools.toml: add VSCodium as a merge tool ... [VSCodium](https://vscodium.com/) is a free/libre distribution of Microsoft's Visual Studio Code editor, it's functionally more or less the same, but distributed under a FOSS license, unlike VS Code. This adds VSCodium as a merge tool.		2024-08-19 22:37:00 -07:00
..
design	cleanup: leverage BoxStream/BoxFuture type aliases	2024-06-26 11:34:52 +09:00
technical	docs: update description of conflicts to be about tree-level conflicts	2023-11-30 14:24:48 -08:00
branches.md	docs: minor updates to description of branch conflicts	2024-08-05 18:20:37 -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	docs: s/socio-economics/socioeconomics/ per codespell suggestion	2024-05-24 11:34:03 +09:00
community_tools.md	Add hunk.nvim to list of community tools	2024-07-22 15:29:54 -06:00
config.md	merge_tools.toml: add VSCodium as a merge tool	2024-08-19 22:37:00 -07:00
config.toml	docs: document git.fetch and git.push config options	2024-02-09 12:03:42 -06:00
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: replace jj files -> jj file list	2024-06-24 21:01:55 -07:00
git-compatibility.md	docs/git-comparison.md: update the Signed_commits bullet	2024-07-17 17:12:34 +02:00
github.md	docs: ask MkDocs to fail on links to non-existent sections	2024-05-14 13:14:27 -07:00
glossary.md	docs: fix another missing shell quoting around root()	2024-06-04 21:19:16 +09:00
index.md	docs index.md: explain that the website sidebar may be hidden	2023-10-04 05:25:37 -07:00
install-and-setup.md	docs: document how to compile a statically linked binary on Mac	2024-08-11 20:10:37 -07:00
operation-log.md	op_walk: add support for op_id+ (children) operator	2024-01-02 10:30:08 +09:00
related-work.md	politics: delete references to Pijul	2024-04-14 13:16:08 -07:00
revsets.md	Define builtin_immutable_heads() as a default revset alias.	2024-08-14 11:32:16 +01: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	docs: Add a Testmonials page.	2024-02-25 14:20:33 +01:00
tutorial.md	tutorial: link to Steve Klabnik's tutorial, mention jj log -r ::	2024-08-06 11:27:08 -07:00
windows.md	docs: update windows docs to mention minus, update minus docs	2024-06-10 11:47:34 -07:00
working-copy.md	docs: say that we support $GIT_DIR/info/exclude	2024-03-08 09:59:10 -08:00