jj/docs at 4e8f51a983d99c6c71fc0fb26fb5331b8d03125f - jj

mirror of https://github.com/martinvonz/jj.git synced 2025-05-28 18:41:31 +00:00

History

Martin von Zweigbergk 9d040fef78 docs: indent conflict marker examples to not confuse tools

When importing `conflicts.md` into the Google repo, our internal tools
complained that it contained conflict markers. Similarly, if you ever
get an actual merge conflict in the file, the working-copy
snapshotting would parse our sample conflict markers here, forcing you
to work around it. Let's avoid that by indenting the conflict
markers. Hopefully readers will understand that the leading space is
not part of the markers.

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

technical

docs: mention that the "view" object knows about all workspaces

2022-12-08 17:30:29 -08:00

branches.md

templater: indicate if branch needs to be pushed to a remote

2022-11-09 22:44:55 -08:00

code-of-conduct.md

Boilerplate for new Google open source project

2020-12-11 23:37:59 -08:00

config.md

pager: default to less -FRX