Austin Seipp c8f703f14b docs: fix some automerge fallout ... I enabled automerge for #2994, but forgot to actually *push* my changes before resolving all the conversations, so GitHub insta-merged it. This just addresses Ilya and Philip's final comments on #2994. Signed-off-by: Austin Seipp <aseipp@pobox.com>		2024-02-09 12:36:28 -06:00
..
design	sparse-v2: design doc proposition for Sparse Patterns refactoring	2024-02-01 16:02:14 -08:00
technical
branches.md	docs branches.md: insert definitions for related terms	2024-01-24 18:47:17 -08:00
cli-reference.md	docs: store output of jj util markdown-help, render it on the website	2024-01-30 14:58:32 -08:00
code-of-conduct.md
config.md	docs: fix some automerge fallout	2024-02-09 12:36:28 -06:00
config.toml	docs: document git.fetch and git.push config options	2024-02-09 12:03:42 -06:00
conflicts.md
contributing.md	docs: explain that approving your coworker's PRs should be avoided	2024-02-06 21:34:58 -08:00
FAQ.md	docs: Add FAQ item for git log	2024-02-06 15:03:51 -07:00
git-comparison.md	cli: deprecate jj checkout	2024-02-03 17:21:56 -06:00
git-compatibility.md
github.md
glossary.md	docs branches.md: insert definitions for related terms	2024-01-24 18:47:17 -08:00
index.md
install-and-setup.md
operation-log.md
related-work.md
revsets.md	docs: emphasize and clarify log revsets relevant to people coming from git	2024-01-31 15:51:40 -08:00
sapling-comparison.md
templates.md	templater: evaluate logical operator expressions (||, &&, and !)	2024-02-09 07:42:54 +09:00
tutorial.md	cli: deprecate jj checkout	2024-02-03 17:21:56 -06:00
windows.md	docs: add notes for Windows users	2024-01-29 12:16:15 -08:00
working-copy.md