docs: suggest "jj bookmark move" where makes sense

Closes #5067
martinvonz · Dec 11, 2024 · e1936a2 · e1936a2
1 parent 32ee480
commit e1936a2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/docs/FAQ.md b/docs/FAQ.md
@@ -5,7 +5,7 @@
 If you're familiar with Git, you might expect the current bookmark to move forward
 when you commit. However, Jujutsu does not have a concept of a "current bookmark".
 
-To move bookmarks, use `jj bookmark set`.
+To move bookmarks, use `jj bookmark move`.
 
 ### I made a commit and `jj git push --all` says "Nothing changed" instead of pushing it. What do I do?
 
@@ -317,7 +317,7 @@ of them before abandoning it.
 A [conflicted bookmark][bookmarks_conflicts] is a bookmark that refers to multiple
 different commits because jj couldn't fully resolve its desired position.
 Resolving conflicted bookmarks is usually done by setting the bookmark to the
-correct commit using `jj bookmark set <commit ID>`.
+correct commit using `jj bookmark move <name> --to <commit ID>`.
 
 Usually, the different commits associated with the conflicted bookmark should all
 appear in the log, but if they don't you can use `jj bookmark list`to show all the

diff --git a/docs/bookmarks.md b/docs/bookmarks.md
@@ -183,7 +183,7 @@ makes several safety checks.
    if the unexpected location is identical to the local position of the bookmark.
 
 2. The local bookmark must not be [conflicted](#conflicts). If it is, you would
-   need to use `jj bookmark set`, for example, to resolve the conflict.
+   need to use `jj bookmark move`, for example, to resolve the conflict.
 
    This makes `jj git push` safe even if `jj git fetch` is performed on a timer
    in the background (this situation is a known issue[^known-issue] with some

diff --git a/docs/github.md b/docs/github.md
@@ -116,7 +116,7 @@ $ jj diff
 $ # Give the fix a description and create a new working-copy on top.
 $ jj commit -m 'address pr comments'
 $ # Update the bookmark to point to the new commit.
-$ jj bookmark set your-feature -r @-
+$ jj bookmark move your-feature --to @-
 $ # Push it to your remote
 $ jj git push
 ```
@@ -136,7 +136,7 @@ $ jj diff
 $ # Give the fix a description.
 $ jj describe -m 'address pr comments'
 $ # Update the bookmark to point to the current commit.
-$ jj bookmark set your-feature -r @
+$ jj bookmark move your-feature --to @
 $ # Push it to your remote
 $ jj git push
 ```