ok/jj
1
0
Fork 0
forked from mirrors/jj
jj/docs
Ilya Grigoriev ef23c35550 docs branches.md: explain the new defaults and reorganize
This follows up on #2625 and updates all sections of `branches.md` to represent
the new default of `git.auto-local-branch=false`.

I realized that the paragraph we discussed for so long with @PhilipMetzger
actually repeats information that was already present a bit earlier in the file.
So, I removed most of it and moved the rest. Sorry I didn't notice this earler.

## The callout

Unfortunately, GitHub and MkDocs use different syntax for admonitions.

The callout looks like this in MkDocs:
https://github.com/martinvonz/jj/assets/4123047/45d79e7a-35db-492e-a227-004b7e3383c1

Use `poetry run -- mkdocs serve` to double-check.
2024-01-24 18:47:17 -08:00
..
design git: turn git.auto-local-branch off by default 2023-12-17 08:30:24 +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 branches.md: explain the new defaults and reorganize 2024-01-24 18:47:17 -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 config.md Vim instructions: link to the Wiki instead of a gist 2023-12-17 22:16:02 -08:00
config.toml
conflicts.md
contributing.md docs contributing.md: document using mold linker with nextest 2024-01-21 19:28:37 -08:00
FAQ.md FAQ: Describe how to integrate with Gerrit. 2024-01-01 21:08:19 +01:00
git-comparison.md docs: try to clarify that jj doesn't need a staging area 2024-01-22 15:47:24 -08: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
index.md
install-and-setup.md
operation-log.md op_walk: add support for op_id+ (children) operator 2024-01-02 10:30:08 +09:00
related-work.md
revsets.md
sapling-comparison.md
templates.md cli: give root operation special treatment in template (like root commit) 2024-01-14 10:15:14 -08:00
tutorial.md docs: update CLI output in Tutorial 2024-01-08 19:59:59 +04:00
working-copy.md