From d2c2c270f88fc126c9f1d48971a662d56949b9fa Mon Sep 17 00:00:00 2001 From: Ilya Grigoriev Date: Tue, 31 Oct 2023 18:40:41 -0700 Subject: [PATCH] cli rebase: Move misplaced paragraph, fixup to 8bc3f5fd67 --- cli/src/commands/rebase.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/src/commands/rebase.rs b/cli/src/commands/rebase.rs index e9411f76f..5e9e45454 100644 --- a/cli/src/commands/rebase.rs +++ b/cli/src/commands/rebase.rs @@ -133,14 +133,14 @@ pub(crate) struct RebaseArgs { /// Rebase only this revision, rebasing descendants onto this revision's /// parent(s) /// + /// Unlike `-s` or `-b`, you may `jj rebase -r` a revision `A` onto a + /// descendant of `A`. + /// /// If none of `-b`, `-s`, or `-r` is provided, then the default is `-b @`. #[arg(long, short)] revision: Option, /// The revision(s) to rebase onto (can be repeated to create a merge /// commit) - /// - /// Unlike `-s` or `-b`, you may `jj rebase -r` a revision `A` onto a - /// descendant of `A`. #[arg(long, short, required = true)] destination: Vec, /// Deprecated. Please prefix the revset with `all:` instead.