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

cli: replace "evolve" by "rebase" in a help text about jj prune

Browse source 
Now that we auto-evolve after most operations, the user may not know
what "evolve" means. Even before that, the way `jj evolve` resolved
orphans after pruning was by rebasing them.
This commit is contained in:
Martin von Zweigbergk 2021-05-26 15:12:20 -07:00
parent e658cc0084
commit 749317f82d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/commands.rs
View file

@ -535,7 +535,7 @@ fn get_app<'a, 'b>() -> App<'a, 'b> {
.about("Create a copy of the commit with a new change id")
.arg(rev_arg());
let prune_command = SubCommand::with_name("prune")
.about("Mark a commit pruned, making descendants evolve onto its parent")
.about("Mark a commit pruned, making descendants rebase onto its parent")
.arg(Arg::with_name("revision").index(1).default_value("@"));
let new_command = SubCommand::with_name("new")
.about("Create a new, empty commit")