Skip to content

Commit

Permalink
rebase: allow -r to accept multiple revisions
Browse files Browse the repository at this point in the history
  • Loading branch information
bnjmnt4n committed Apr 26, 2024
1 parent c267f55 commit 5389acf
Show file tree
Hide file tree
Showing 5 changed files with 438 additions and 99 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* `builtin_change_id_with_hidden_and_divergent_info` ->
`format_short_change_id_with_hidden_and_divergent_info(commit: Commit)`

* The `--revision` option of `jj rebase` is renamed to `--revisions`. The short
alias `-r` is still supported.

### New features

* The list of conflicted paths is printed whenever the working copy changes.
Expand Down Expand Up @@ -54,6 +57,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* You can check whether Watchman fsmonitor is enabled or installed with the new
`jj debug watchman status` command.

* `jj rebase` now accepts revsets resolving to multiple revisions with the
`--revisions`/`-r` option.

### Fixed bugs

* Revsets now support `\`-escapes in string literal.
Expand Down
Loading

0 comments on commit 5389acf

Please sign in to comment.