Ilya Grigoriev fcd02a6091 merge_tools.toml: add VS Code as a default merge tool. ... Thanks to @glencbz for noticing that VS Code works fine now as a merge tool, and thanks to @solson for suggesting `merge-tool-edits-conflict-markers = true`.		2023-10-25 12:47:51 -07:00
..
design	git: on push, update jj's view of remote branches without using import_refs()	2023-10-17 15:06:03 +09:00
technical	docs: More info about syncing jj repo with rsync	2023-09-06 09:15:27 -07:00
branches.md
code-of-conduct.md
config.md	merge_tools.toml: add VS Code as a default merge tool.	2023-10-25 12:47:51 -07:00
config.toml	merge_tools.toml: add VS Code as a default merge tool.	2023-10-25 12:47:51 -07:00
conflicts.md
contributing.md	docs: add a section about profiling	2023-09-14 21:15:03 -07:00
FAQ.md	docs: discuss jj commit -i in FAQ.md	2023-10-22 15:37:41 -07:00
git-comparison.md	Small addition to index comparison	2023-08-14 13:48:46 +09:00
git-compatibility.md	git-compatibility.md: adjust instructions to convert to colocated repo to match 872265a22	2023-10-18 19:45:47 -07:00
github.md	docs: fix broken Markdown in github.md, plus various cleanups	2023-10-24 21:31:51 -07:00
glossary.md	revset: convert root symbol to function	2023-09-04 10:36:30 +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	Add build-essential to install instructions	2023-10-05 09:07:37 -07:00
operation-log.md	docs: fix typo in operation-log.md	2023-08-13 05:08:45 +00:00
related-work.md	docs: add doc comparing jj to Sapling (#1708)	2023-06-28 06:56:57 +02:00
revsets.md	docs: mention the immutable_heads() in our list of built-in aliases	2023-10-23 12:05:09 -07:00
sapling-comparison.md	docs: markdown fixups, mostly to remove links pointing outside docs	2023-08-28 10:43:48 -07:00
templates.md	templates.md docs: Document string literal format	2023-09-15 20:16:09 -07:00
tutorial.md	tutorial.md: no need to mention heads(x) anymore	2023-10-23 12:01:17 +02:00
working-copy.md