From 749317f82d82bcb892ab93b39fda1b6f346be854 Mon Sep 17 00:00:00 2001 From: Martin von Zweigbergk Date: Wed, 26 May 2021 15:12:20 -0700 Subject: [PATCH] cli: replace "evolve" by "rebase" in a help text about `jj prune` 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. --- src/commands.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commands.rs b/src/commands.rs index 09fe329fc..77012cf57 100644 --- a/src/commands.rs +++ b/src/commands.rs @@ -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")