diff --git a/CHANGELOG.md b/CHANGELOG.md index 98d7f2bd60..af36877be0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,9 +36,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * `jj log` now includes synthetic nodes in the graph where some revisions were elided. -* `jj squash` now accepts `--from` and `--into` (mutually exclusive with `-r`). - It can thereby be for all use cases where `jj move` can be used. The `--from` - argument accepts a revset that resolves to more than one revision. +* `jj squash` now accepts `--from` and `--into` (also aliased as `--to`) if `-r` + is not specified. It can now be used for all use cases where `jj move` could + previously be used. The `--from` argument accepts a revset that resolves to + more than one revision. * Commit templates now support `immutable` keyword. diff --git a/cli/src/commands/squash.rs b/cli/src/commands/squash.rs index 484116498d..04c8be95f5 100644 --- a/cli/src/commands/squash.rs +++ b/cli/src/commands/squash.rs @@ -57,7 +57,7 @@ pub(crate) struct SquashArgs { #[arg(long, conflicts_with = "revision")] from: Option, /// Revision to squash into (default: @) - #[arg(long, conflicts_with = "revision")] + #[arg(long, conflicts_with = "revision", visible_alias = "to")] into: Option, /// The description to use for squashed revision (don't open editor) #[arg(long = "message", short, value_name = "MESSAGE")]