From e1936a2e8bc22218e3a5729fed89b8cc5c5cbb83 Mon Sep 17 00:00:00 2001 From: Yuya Nishihara Date: Tue, 10 Dec 2024 22:33:26 +0900 Subject: [PATCH] docs: suggest "jj bookmark move" where makes sense Closes #5067 --- docs/FAQ.md | 4 ++-- docs/bookmarks.md | 2 +- docs/github.md | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/FAQ.md b/docs/FAQ.md index e653ef3367..2d6467e8db 100644 --- 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 `. +correct commit using `jj bookmark move --to `. 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 index cc63f5316d..4c16e25c94 100644 --- 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 index b1528aecb5..98334c11fa 100644 --- 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 ```