ok/jj
1
0
Fork 0
forked from mirrors/jj
jj/docs
Philip Metzger d9c68e08b1 everything: Rename branches to bookmarks
Jujutsu's branches do not behave like Git branches, which is a major
hurdle for people adopting it from Git. They rather behave like
Mercurial's (hg) bookmarks. 

We've had multiple discussions about it in the last ~1.5 years about this rename in the Discord, 
where multiple people agreed that this _false_ familiarity does not help anyone. Initially we were 
reluctant to do it but overtime, more and more users agreed that `bookmark` was a better for name 
the current mechanism. This may be hard break for current `jj branch` users, but it will immensly 
help Jujutsu's future, by defining it as our first own term. The `[experimental-moving-branches]` 
config option is currently left alone, to force not another large config update for
users, since the last time this happened was when `jj log -T show` was removed, which immediately 
resulted in breaking users and introduced soft deprecations.

This name change will also make it easier to introduce Topics (#3402) as _topological branches_ 
with a easier model. 

This was mostly done via LSP, ripgrep and sed and a whole bunch of manual changes either from
me being lazy or thankfully pointed out by reviewers.
2024-09-11 18:54:45 +02:00
..
design cleanup: leverage BoxStream/BoxFuture type aliases 2024-06-26 11:34:52 +09:00
technical op log: change "resolve concurrent" to "reconcile divergent" 2024-08-30 21:56:11 -07:00
bookmarks.md everything: Rename branches to bookmarks 2024-09-11 18:54:45 +02:00
cli-reference.md docs CLI Reference: make the warning in the beginning less scary 2024-06-15 20:30:40 -07:00
code-of-conduct.md docs: s/socio-economics/socioeconomics/ per codespell suggestion 2024-05-24 11:34:03 +09:00
community_tools.md Add hunk.nvim to list of community tools 2024-07-22 15:29:54 -06:00
config.md everything: Rename branches to bookmarks 2024-09-11 18:54:45 +02:00
config.toml docs: document git.fetch and git.push config options 2024-02-09 12:03:42 -06:00
conflicts.md docs: Fix example with Git conflicts markers 2024-08-02 10:36:38 -07:00
contributing.md everything: Rename branches to bookmarks 2024-09-11 18:54:45 +02:00
design_doc_blueprint.md docs: Add a Design Doc blueprint. 2024-06-30 15:37:40 +02:00
design_docs.md docs: Add a Design Doc blueprint. 2024-06-30 15:37:40 +02:00
FAQ.md everything: Rename branches to bookmarks 2024-09-11 18:54:45 +02:00
filesets.md cli: enable fileset by default 2024-07-24 10:49:46 +09:00
git-comparison.md everything: Rename branches to bookmarks 2024-09-11 18:54:45 +02:00
git-compatibility.md everything: Rename branches to bookmarks 2024-09-11 18:54:45 +02:00
github.md everything: Rename branches to bookmarks 2024-09-11 18:54:45 +02:00
glossary.md everything: Rename branches to bookmarks 2024-09-11 18:54:45 +02:00
index.md docs: add link to roadmap from docs main page 2024-09-04 00:03:32 -07:00
install-and-setup.md Added docs about installation under Gentoo Linux 2024-08-20 22:19:09 -07:00
operation-log.md op log: change "resolve concurrent" to "reconcile divergent" 2024-08-30 21:56:11 -07:00
related-work.md politics: delete references to Pijul 2024-04-14 13:16:08 -07:00
revsets.md docs: add missing single quote to revset-aliases example 2024-08-25 23:16:29 +09:00
roadmap.md docs(roadmap): minor typo, as should be ask 2024-09-04 20:07:04 +02:00
sapling-comparison.md docs: explain that jj was started 3 years before Sapling announcement 2024-06-20 05:24:28 +09:00
templates.md everything: Rename branches to bookmarks 2024-09-11 18:54:45 +02:00
testimonials.md docs: Add a Testmonials page. 2024-02-25 14:20:33 +01:00
tutorial.md cli: rename obslog to evolution-log/evolog 2024-09-05 13:45:17 -07:00
windows.md docs: update windows docs to mention minus, update minus docs 2024-06-10 11:47:34 -07:00
working-copy.md cli: make paths to auto-track configurable, add jj track 2024-09-09 07:49:55 -07:00