mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-06 03:22:59 +00:00
docs: Use "branch" consistently when talking about Git's branches
Some checks are pending
binaries / Build binary artifacts (push) Waiting to run
nix / flake check (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 / Run doctests (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 latest Python and uv (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 (push) Waiting to run
nix / flake check (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 / Run doctests (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 latest Python and uv (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 places used "bookmark" instead, which makes it harder to differentiate between jj's and Git's differing concepts.
This commit is contained in:
parent
337663c312
commit
1ddfc59ee9
1 changed files with 3 additions and 3 deletions
|
@ -68,7 +68,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,
|
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
|
`jj` does store the last-seen position of the remote bookmark; this is the
|
||||||
commit `jj show <bookmark name>@<remote name>` would show. This notion is
|
commit `jj show <bookmark name>@<remote name>` 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
|
- 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
|
tracked with the [`jj bookmark track` command](#manually-tracking-a-bookmark), for
|
||||||
example.
|
example.
|
||||||
|
@ -146,8 +146,8 @@ 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`.
|
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.
|
Then, `jj git fetch` tracks every *newly fetched* bookmark with a local bookmark.
|
||||||
Branches that already existed before the `jj git fetch` are not affected. This
|
Branches that already existed before the `jj git fetch` are not affected. This
|
||||||
is similar to Mercurial, which fetches all its bookmarks (equivalent to Git
|
is similar to Mercurial, which fetches all its bookmarks (equivalent to Git's
|
||||||
bookmarks) by default.
|
branches) by default.
|
||||||
|
|
||||||
## Bookmark movement
|
## Bookmark movement
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue