From e64b42245033ed17870b584e45bd1046ec408504 Mon Sep 17 00:00:00 2001 From: Philip Metzger Date: Tue, 17 Sep 2024 18:48:27 +0200 Subject: [PATCH] docs: Rework `bookmarks.md` This applies some suggestions from Ilya from #4143 and starts to differentiate in terminology. --- docs/bookmarks.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/bookmarks.md b/docs/bookmarks.md index 59472120cca..45924b8861e 100644 --- a/docs/bookmarks.md +++ b/docs/bookmarks.md @@ -11,8 +11,8 @@ pass a bookmark's name to commands that want a revision as argument. For example `jj bookmark list` to list bookmarks and `jj bookmark` to create, move, or delete bookmarks. There is currently no concept of an active/current/checked-out bookmark. -Currently Jujutsu maps its Bookmarks to Git Branches and stores them as that -in the Git backend. This means that all Bookmarks will be reflected as +In a Jujutsu repo that's colocated with Git, Jujutsu's bookmarks map to Git +branches. This means that all Bookmarks will be reflected as Git Branches, this may change in the future. ## Remotes and tracked bookmarks @@ -61,7 +61,7 @@ If you want to know the internals of bookmark tracking, consult the actual state only when it's actively communicating with the remote. However, `jj` does store the last-seen position of the remote bookmark; this is the commit `jj show @` would show. This notion is - completely analogous to Git's "remote-tracking bookmarks". + completely analogous to Git's "remote-tracking branches". - A **tracked (remote) bookmark** is defined above. You can make a remote bookmark tracked with the [`jj bookmark track` command](#manually-tracking-a-bookmark), for example.