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

docs: update description of conflicts to be about tree-level conflicts

2023-11-30 14:24:48 -08:00

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

Replace contact method with addresses of active leads.

2023-11-28 13:48:22 -05:00

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

docs: indent conflict marker examples to not confuse tools

2022-12-12 16:20:40 -08:00

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

gc: implement basic GC for Git backend

2023-12-03 07:40:12 -08:00

github.md

git: turn git.auto-local-branch off by default

2023-12-17 08:30:24 +09:00

glossary.md

docs branches.md: insert definitions for related terms

2024-01-24 18:47:17 -08: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

install-and-setup.md: --strategy -> --strategies for cargo binstall

2023-11-21 20:19:38 -08:00

operation-log.md

op_walk: add support for op_id+ (children) operator

2024-01-02 10:30:08 +09:00

related-work.md

docs: add doc comparing jj to Sapling (#1708)

2023-06-28 06:56:57 +02:00

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

mkdocs: make MkDocs work with more GitHub-like list formatting

2023-11-03 19:15:37 -07:00

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

workspace: add a root subcommand to print the workspace root path

2023-01-24 16:53:54 +01:00