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 2f45a48 commit 4968bab
Show file tree
Hide file tree
Showing 5 changed files with 474 additions and 93 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

* The default template alias `builtin_log_root(change_id: ChangeId, commit_id: CommitId)` was replaced by `format_root_commit(root: 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 @@ -50,6 +53,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 4968bab

Please sign in to comment.