mirror of
https://github.com/martinvonz/jj.git
synced 2024-11-24 06:19:42 +00:00
docs: remove trailing whitespace in .md
Some checks are pending
binaries / Build binary artifacts (linux-aarch64-gnu, ubuntu-24.04, aarch64-unknown-linux-gnu) (push) Waiting to run
binaries / Build binary artifacts (linux-aarch64-musl, ubuntu-24.04, aarch64-unknown-linux-musl) (push) Waiting to run
binaries / Build binary artifacts (linux-x86_64-gnu, ubuntu-24.04, x86_64-unknown-linux-gnu) (push) Waiting to run
binaries / Build binary artifacts (linux-x86_64-musl, ubuntu-24.04, x86_64-unknown-linux-musl) (push) Waiting to run
binaries / Build binary artifacts (macos-aarch64, macos-14, aarch64-apple-darwin) (push) Waiting to run
binaries / Build binary artifacts (macos-x86_64, macos-13, x86_64-apple-darwin) (push) Waiting to run
binaries / Build binary artifacts (win-x86_64, windows-2022, x86_64-pc-windows-msvc) (push) Waiting to run
nix / flake check (macos-14) (push) Waiting to run
nix / flake check (ubuntu-latest) (push) Waiting to run
build / build (, macos-13) (push) Waiting to run
build / build (, macos-14) (push) Waiting to run
build / build (, ubuntu-latest) (push) Waiting to run
build / build (, windows-latest) (push) Waiting to run
build / build (--all-features, ubuntu-latest) (push) Waiting to run
build / Build jj-lib without Git support (push) Waiting to run
build / Check protos (push) Waiting to run
build / Check formatting (push) Waiting to run
build / Check that MkDocs can build the docs (push) Waiting to run
build / Check that MkDocs can build the docs with Poetry 1.8 (push) Waiting to run
build / cargo-deny (advisories) (push) Waiting to run
build / cargo-deny (bans licenses sources) (push) Waiting to run
build / Clippy check (push) Waiting to run
Codespell / Codespell (push) Waiting to run
website / prerelease-docs-build-deploy (ubuntu-latest) (push) Waiting to run
Scorecards supply-chain security / Scorecards analysis (push) Waiting to run
Some checks are pending
binaries / Build binary artifacts (linux-aarch64-gnu, ubuntu-24.04, aarch64-unknown-linux-gnu) (push) Waiting to run
binaries / Build binary artifacts (linux-aarch64-musl, ubuntu-24.04, aarch64-unknown-linux-musl) (push) Waiting to run
binaries / Build binary artifacts (linux-x86_64-gnu, ubuntu-24.04, x86_64-unknown-linux-gnu) (push) Waiting to run
binaries / Build binary artifacts (linux-x86_64-musl, ubuntu-24.04, x86_64-unknown-linux-musl) (push) Waiting to run
binaries / Build binary artifacts (macos-aarch64, macos-14, aarch64-apple-darwin) (push) Waiting to run
binaries / Build binary artifacts (macos-x86_64, macos-13, x86_64-apple-darwin) (push) Waiting to run
binaries / Build binary artifacts (win-x86_64, windows-2022, x86_64-pc-windows-msvc) (push) Waiting to run
nix / flake check (macos-14) (push) Waiting to run
nix / flake check (ubuntu-latest) (push) Waiting to run
build / build (, macos-13) (push) Waiting to run
build / build (, macos-14) (push) Waiting to run
build / build (, ubuntu-latest) (push) Waiting to run
build / build (, windows-latest) (push) Waiting to run
build / build (--all-features, ubuntu-latest) (push) Waiting to run
build / Build jj-lib without Git support (push) Waiting to run
build / Check protos (push) Waiting to run
build / Check formatting (push) Waiting to run
build / Check that MkDocs can build the docs (push) Waiting to run
build / Check that MkDocs can build the docs with Poetry 1.8 (push) Waiting to run
build / cargo-deny (advisories) (push) Waiting to run
build / cargo-deny (bans licenses sources) (push) Waiting to run
build / Clippy check (push) Waiting to run
Codespell / Codespell (push) Waiting to run
website / prerelease-docs-build-deploy (ubuntu-latest) (push) Waiting to run
Scorecards supply-chain security / Scorecards analysis (push) Waiting to run
This commit is contained in:
parent
f56f07bd54
commit
7d9e9a1434
4 changed files with 11 additions and 11 deletions
|
@ -122,7 +122,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
|||
* Error on `trunk()` revset resolution is now handled gracefully.
|
||||
[#4616](https://github.com/martinvonz/jj/issues/4616)
|
||||
|
||||
* Updated the built-in diff editor `scm-record` to version
|
||||
* Updated the built-in diff editor `scm-record` to version
|
||||
[0.4.0](https://github.com/arxanas/scm-record/releases/tag/v0.4.0), which
|
||||
includes multiple fixes.
|
||||
|
||||
|
|
|
@ -329,7 +329,7 @@ There are some trade-offs and there is no definitive answer yet.
|
|||
* Using `jj-lib` avoids parsing command output and makes error handling easier.
|
||||
* `jj-lib` is not a stable API, so you may have to make changes to your tool
|
||||
when the API changes.
|
||||
* The CLI is not stable either, so you may need to make your tool detect the
|
||||
* The CLI is not stable either, so you may need to make your tool detect the
|
||||
different versions and call the right command.
|
||||
* Using the CLI means that your tool will work with custom-built `jj` binaries,
|
||||
like the one at Google (if you're using the library, you will not be able to
|
||||
|
|
|
@ -59,7 +59,7 @@ target there, `jj log` will show the bookmark name with an asterisk suffix (e.g.
|
|||
`main*`). That is meant to remind you that you may want to push the bookmark to
|
||||
some remote.
|
||||
|
||||
If you want to know the internals of bookmark tracking, consult the
|
||||
If you want to know the internals of bookmark tracking, consult the
|
||||
[Design Doc][design].
|
||||
|
||||
### Terminology summary
|
||||
|
@ -85,9 +85,9 @@ must match.
|
|||
|
||||
### Manually tracking a bookmark
|
||||
|
||||
To track a bookmark permanently use `jj bookmark track <bookmark name>@<remote name>`.
|
||||
To track a bookmark permanently use `jj bookmark track <bookmark name>@<remote name>`.
|
||||
It will now be imported as a local bookmark until you untrack it or it is deleted
|
||||
on the remote.
|
||||
on the remote.
|
||||
|
||||
Example:
|
||||
|
||||
|
@ -110,7 +110,7 @@ To stop following a remote bookmark, you can `jj bookmark untrack` it. After tha
|
|||
subsequent fetches of that remote will no longer move the local bookmark to match
|
||||
the position of the remote bookmark.
|
||||
|
||||
Example:
|
||||
Example:
|
||||
|
||||
```sh
|
||||
$ # List all local and remote bookmarks.
|
||||
|
@ -141,7 +141,7 @@ marked as tracked.
|
|||
|
||||
By default, every other remote bookmark is marked as "not tracked" when it's
|
||||
fetched. If desired, you need to manually `jj bookmark track` them. This works
|
||||
well for repositories where multiple people work on a large number of bookmarks.
|
||||
well for repositories where multiple people work on a large number of bookmarks.
|
||||
|
||||
The default can be changed by setting the config `git.auto-local-bookmark = true`.
|
||||
Then, `jj git fetch` tracks every *newly fetched* bookmark with a local bookmark.
|
||||
|
@ -154,13 +154,13 @@ bookmarks) by default.
|
|||
Currently Jujutsu automatically moves local bookmarks when these conditions are
|
||||
met:
|
||||
|
||||
* When a commit has been rewritten (e.g, when you rebase) bookmarks and the
|
||||
* When a commit has been rewritten (e.g, when you rebase) bookmarks and the
|
||||
working-copy will move along with it.
|
||||
* When a commit has been abandoned, all associated bookmarks will be moved
|
||||
* When a commit has been abandoned, all associated bookmarks will be moved
|
||||
to its parent(s). If a working copy was pointing to the abandoned commit,
|
||||
then a new working-copy commit will be created on top of the parent(s).
|
||||
|
||||
You could describe the movement as following along the change-id of the
|
||||
You could describe the movement as following along the change-id of the
|
||||
current bookmark commit, even if it isn't entirely accurate.
|
||||
|
||||
## Pushing bookmarks: Safety checks
|
||||
|
|
|
@ -29,7 +29,7 @@ for details.
|
|||
|
||||
Unlike in Git, there is no concept of a "current bookmark"; bookmarks *do not*
|
||||
move when you create a new commit. Bookmarks *do* automatically follow the
|
||||
commit if it gets [rewritten](#rewrite).
|
||||
commit if it gets [rewritten](#rewrite).
|
||||
|
||||
## Branch
|
||||
|
||||
|
|
Loading…
Reference in a new issue