Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rebase: allow -r to accept multiple revisions #3564

Merged
merged 1 commit into from
Apr 26, 2024
Merged

rebase: allow -r to accept multiple revisions #3564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
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 @@ -56,6 +59,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

* A new global flag `--ignore-immutable` lets you rewrite immutable commits.

* `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