mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-27 06:23:18 +00:00
changelog: conflict()
and file()
deprecations are yet unreleased.
Move this update under `Unreleased`. I started the change before the last release and after rebasing, forgot to move it. Fixing it now thanks to @yuja catching this on time. Issue: #4122
This commit is contained in:
parent
9551794f19
commit
e99cca8a93
1 changed files with 4 additions and 4 deletions
|
@ -34,6 +34,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
* The `git.push-branch-prefix` config has been deprecated in favor of
|
* The `git.push-branch-prefix` config has been deprecated in favor of
|
||||||
`git.push-bookmark-prefix`.
|
`git.push-bookmark-prefix`.
|
||||||
|
|
||||||
|
* `conflict()` and `file()` revsets have been renamed to `conflicts()` and `files()`
|
||||||
|
respectively. The old names are still around and will be removed in a future
|
||||||
|
release.
|
||||||
|
|
||||||
### New features
|
### New features
|
||||||
|
|
||||||
* The new config option `snapshot.auto-track` lets you automatically track only
|
* The new config option `snapshot.auto-track` lets you automatically track only
|
||||||
|
@ -94,10 +98,6 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
commit to commit. It now either follows the flags `--edit|--no-edit` or it
|
commit to commit. It now either follows the flags `--edit|--no-edit` or it
|
||||||
gets the mode from `ui.movement.edit`.
|
gets the mode from `ui.movement.edit`.
|
||||||
|
|
||||||
* `conflict()` and `file()` revsets have been renamed to `conflicts()` and `files()`
|
|
||||||
respectively. With this, all revsets that could potentially return multiple
|
|
||||||
results are named in the plural.
|
|
||||||
|
|
||||||
### Deprecations
|
### Deprecations
|
||||||
|
|
||||||
* `jj untrack` has been renamed to `jj file untrack`.
|
* `jj untrack` has been renamed to `jj file untrack`.
|
||||||
|
|
Loading…
Reference in a new issue