rebase: allow -r to accept multiple revisions

martinvonz · Apr 26, 2024 · 6752402 · 6752402
1 parent 586ab1f
commit 6752402
Show file tree

Hide file tree

Showing 5 changed files with 438 additions and 99 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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.
@@ -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.