jj/docs/ at nested-conflicts · ilyagr.bsky.social/jj

ilyagr.bsky.social / jj

0

just playing with tangled

0

jj / docs /

at nested-conflicts 2 folders 23 files

sparse-v2: design doc proposition for Sparse Patterns refactoring

2 years ago

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

2 years ago

docs: add FAQ for why to use new-then-amend over edit

2 years ago

docs: Add a short section on branch movement.

2 years ago

cli-reference.md

docs, CLI reference: use `include-markdown` instead of a symlink

2 years ago

code-of-conduct.md

Replace contact method with addresses of active leads.

2 years ago

log: encode elided node as None

2 years ago

docs: document `git.fetch` and `git.push` config options

2 years ago

docs: indent conflict marker examples to not confuse tools

3 years ago

contributing.md

rust: bump MSRV to 1.76.0

2 years ago

git-comparison.md

docs: Add missing "jj" to swap rebase example

2 years ago

git-compatibility.md

docs: update remaining references on "jj init --git-repo"

2 years ago

cli: unblock "jj git init --colocate" in existing Git repo directory

2 years ago

docs `branches.md`: insert definitions for related terms

2 years ago

docs index.md: explain that the website sidebar may be hidden

2 years ago

install-and-setup.md

Add archlinux instructions to install-and-setup.md

2 years ago

operation-log.md

op_walk: add support for op_id+ (children) operator

2 years ago

related-work.md

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

2 years ago

docs: update revset alias example to something very different from builtins

2 years ago

sapling-comparison.md

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

2 years ago

commit_templater: teach elidable (or optional) commit

2 years ago

testimonials.md

docs: Add a Testmonials page.

2 years ago

move: deprecate the command

2 years ago

working_copy: implement symlinks on windows with a helper function

2 years ago

working-copy.md

docs: say that we support `$GIT_DIR/info/exclude`

2 years ago