Ilya Grigoriev
5a735182ac
docs conflicts.md: clarify the revert example a bit
...
Yuya's suggestion from
<https://github.com/jj-vcs/jj/pull/6415#discussion_r2061122640 >.
Co-authored-by: Yuya Nishihara <yuya@tcha.org>
2025-04-27 00:40:27 +00:00
Ilya Grigoriev
1f14f7a0ff
docs conflicts.md: fix confusing typo
...
Fix #6414 .
2025-04-27 00:40:27 +00:00
Martin von Zweigbergk
92629ded4c
docs: make technical conflicts doc better match our recent thinking
...
These days, we usually think of conflicts as one base state and series
of diffs between other states. The base state is normally the parent
when rebasing.
Also, we're deprecated `jj backout` in favor of `jj revert`, so let's
use that terminology.
2025-04-25 13:53:28 +00:00
Yuya Nishihara
3f5f872204
view: rename workspace "id" to "name"
...
This matches the current implementation.
2025-03-31 03:39:29 +00:00
Vincent Ging Ho Yim
7e1433a333
docs: fix missed rename of LocalBackend to SimpleBackend
...
This is a follow-up to f8ab8a0e.
2025-03-18 06:52:00 +00:00
Vincent Ging Ho Yim
a523503dbc
docs: update types diagram to reflect rename of LocalBackend to SimpleBackend
...
This is a follow-up to f8ab8a0e.
2025-03-18 06:52:00 +00:00
Philip Metzger
f8ab8a0e72
lib: rename the LocalBackend to SimpleBackend
...
This makes it clear to source code readers, that it isn't the _native backend_ the project
talks about in the Roadmap.
2025-03-17 17:17:11 +00:00
Martin von Zweigbergk
fe06ef471b
docs: fix a mention of the deleted jj checkout command
...
Closes #5471 .
2025-01-26 17:09:05 +00:00
Austin Seipp
a621d8cf3f
docs: improve and convert library design diagram to SVG
...
It was lovingly hand drawn by yours truly in Excalidraw.
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2025-01-07 20:32:56 -06:00
Martin von Zweigbergk
b836e0ae95
docs/cli: update URLs to from martinvonz user to jj-vcs org
...
We just migrated to the jj-vcs GitHub org, so we should point to the
new GitHub URLs.
2024-12-17 12:44:44 -08:00
Martin von Zweigbergk
1aa2aec141
bookmarks: update some leftover uses of the word "branch"
2024-09-11 19:19:31 -07:00
Martin von Zweigbergk
cc15ecf7c7
op log: change "resolve concurrent" to "reconcile divergent"
...
"Concurrent" operations are not necessarily actually concurrent, so
"divergent" seems like a better name. And "reconcile" seems like a
better term for merging them, though we also sometimes use "merge".
2024-08-30 21:56:11 -07:00
Martin von Zweigbergk
ec7f9e79f6
docs: update description of conflicts to be about tree-level conflicts
...
Fixes #2373
2023-11-30 14:24:48 -08:00
Ilya Grigoriev
be8be2e55a
docs: More info about syncing jj repo with rsync
...
This will be used for context in the next commit
Includes a mention of
https://github.com/martinvonz/jj/issues/2193 .
2023-09-06 09:15:27 -07:00
Ilya Grigoriev
8f29afaafd
docs: markdown fixups, mostly to remove links pointing outside docs
...
This makes mkdocs compile cleanly
2023-08-28 10:43:48 -07:00
Martin von Zweigbergk
28182dbd8e
docs: correct stale info about which backends are dynamically chosen
2023-08-13 14:15:09 +00:00
Martin von Zweigbergk
aac5b7aa25
cargo: rename crates from jujutsu/jujutsu-lib to jj-cli/jj-lib
...
Almost everyone calls the project "jj", and there seeems to be
consensus that we should rename the crates. I originally wanted the
crates to be called `jj` and `jj-lib`, but `jj` was already
taken. `jj-cli` is probably at least as good for it anyway.
Once we've published a 0.8.0 under the new names, we'll release 0.7.1
versions under the old names with pointers to the new crates names.
2023-07-09 06:40:43 +02:00
Kevin Liao
44f3cff219
Fix invalid code link
2023-06-09 07:51:52 +02:00
Martin von Zweigbergk
d087e64abf
cleanup: consistently (?) put removed conflict terms before added ones
2023-05-25 04:24:26 -07:00
Martin von Zweigbergk
e3beb82d5f
docs: add architecture doc
2023-05-16 11:09:20 -07:00
Martin von Zweigbergk
1dbf4df3ea
docs: mention that the "view" object knows about all workspaces
...
I seem to have forgotten to update this when I added support for
workspaces a while back.
I made some other little touchups while at it.
2022-12-08 17:30:29 -08:00
Martin von Zweigbergk
6e23b5b052
docs: change "current checkout" to "working-copy commit"
...
I think "the working-copy commit" is clearer.
2022-09-18 16:19:58 -07:00
Martin von Zweigbergk
b64ee147ae
docs: add technical doc about a conflict design
...
We used to have documention about how conflicts are implemented, but I
removed that a long time ago when I rewrote the README to target users
rather than VCS hackers. Let's have a doc for the VCS hackers (and
curious users) as well, though.
2022-03-09 21:08:41 -08:00
Martin von Zweigbergk
4e20548e32
docs: some futher touch-ups of concurrency.md
2022-01-12 23:20:22 -08:00
Martin von Zweigbergk
4c45844aba
docs: fix a typo in concurrency doc
2022-01-10 07:58:27 -08:00
Martin von Zweigbergk
94fda7935a
docs: add technical doc about lock-free concurrency design
2022-01-09 22:03:19 -08:00
