mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-12 07:14:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

docs: suggest "jj bookmark move" where makes sense
Some checks are pending
binaries / Build binary artifacts (push) Waiting to run
Details
nix / flake check (push) Waiting to run
Details
build / build (, macos-13) (push) Waiting to run
Details
build / build (, macos-14) (push) Waiting to run
Details
build / build (, ubuntu-latest) (push) Waiting to run
Details
build / build (, windows-latest) (push) Waiting to run
Details
build / build (--all-features, ubuntu-latest) (push) Waiting to run
Details
build / Build jj-lib without Git support (push) Waiting to run
Details
build / Check protos (push) Waiting to run
Details
build / Check formatting (push) Waiting to run
Details
build / Check that MkDocs can build the docs (push) Waiting to run
Details
build / Check that MkDocs can build the docs with latest Python and uv (push) Waiting to run
Details
build / cargo-deny (advisories) (push) Waiting to run
Details
build / cargo-deny (bans licenses sources) (push) Waiting to run
Details
build / Clippy check (push) Waiting to run
Details
Codespell / Codespell (push) Waiting to run
Details
website / prerelease-docs-build-deploy (ubuntu-latest) (push) Waiting to run
Details
Scorecards supply-chain security / Scorecards analysis (push) Waiting to run
Details

Browse source 
Closes #5067
This commit is contained in:
Yuya Nishihara 2024-12-10 22:33:26 +09:00
parent 32ee480942
commit e1936a2e8b
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/FAQ.md
View file

@ -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

2
docs/bookmarks.md
View file

@ -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

4
docs/github.md
View file

@ -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
```