ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

cmd squash: alias --to for the --into flag

Browse source 
I keep typing `--to` since I'm used to `jj move` interface. It is
also shorter.

Currently, if I type `--to`, clap unhelpfully suggests whether I
meant `--tool`.
This commit is contained in:
Ilya Grigoriev 2024-04-01 19:46:45 -07:00
parent bb87fac1a4
commit 670e6ac62b
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CHANGELOG.md
View file

@ -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.

2
cli/src/commands/squash.rs
View file

@ -57,7 +57,7 @@ pub(crate) struct SquashArgs {
#[arg(long, conflicts_with = "revision")]
from: Option<RevisionArg>,
/// Revision to squash into (default: @)
#[arg(long, conflicts_with = "revision")]
#[arg(long, conflicts_with = "revision", visible_alias = "to")]
into: Option<RevisionArg>,
/// The description to use for squashed revision (don't open editor)
#[arg(long = "message", short, value_name = "MESSAGE")]