mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-10-24 07:32:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

cli: adjust descriptions of --interactive flags

Browse source 
I thought it was a bit unclear which part of the process was
interactive (it's only choosing parts of the diffs that is
interactive, not choosing destination or anything else).
This commit is contained in:
Martin von Zweigbergk 2022-01-27 21:21:37 -08:00
parent 0c8a116771
commit d3b85783bd
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/commands.rs
View file

@ -1059,15 +1059,15 @@ With the `--from` and/or `--to` options, shows the difference from/to the given
.long_about(
"Move changes from a revision into its parent. After moving the changes into the \
parent, the child revision will have the same content state as before. If that means \
that the change is now empty compared to its parent, it will be abandoned. Note that \
this will always be the case without `--interactive`.",
that the change is now empty compared to its parent, it will be abandoned. This will \
always be the case without `--interactive`.",
)
.arg(rev_arg())
.arg(
Arg::new("interactive")
.long("interactive")
.short('i')
.help("Interactively squash part of the changes"),
.help("Interactively choose which parts to squash"),
);
// TODO: It doesn't make much sense to run this without -i. We should make that
// the default. We should also abandon the parent commit if that becomes empty.
@ -1079,7 +1079,7 @@ With the `--from` and/or `--to` options, shows the difference from/to the given
Arg::new("interactive")
.long("interactive")
.short('i')
.help("Interactively unsquash part of the changes"),
.help("Interactively choose which parts to unsquash"),
);
let restore_command = App::new("restore")
.about("Restore paths from another revision")
@ -1113,7 +1113,7 @@ With the `--from` and/or `--to` options, shows the difference from/to the given
Arg::new("interactive")
.long("interactive")
.short('i')
.help("Interactively restore part of the changes"),
.help("Interactively choose which parts to restore"),
)
.arg(paths_arg());
let edit_command = App::new("edit")