From 9963879d1549cf6e692154687f709ec84dce5942 Mon Sep 17 00:00:00 2001 From: Waleed Khan Date: Mon, 12 Jun 2023 14:06:49 -0700 Subject: [PATCH] docs(commands): adjust option help text for `jj rebase` --- src/commands/mod.rs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/commands/mod.rs b/src/commands/mod.rs index 59a622621..f3dc900f7 100644 --- a/src/commands/mod.rs +++ b/src/commands/mod.rs @@ -783,6 +783,8 @@ struct RebaseArgs { /// /// `jj rebase -b=br -d=dst` is equivalent to `jj rebase '-s=roots(dst..br)' /// -d=dst`. + /// + /// If none of `-b`, `-s`, or `-r` is provided, then the default is `-b @`. #[arg(long, short)] branch: Vec, @@ -792,13 +794,18 @@ struct RebaseArgs { /// Each specified revision will become a direct child of the destination /// revision(s), even if some of the source revisions are descendants /// of others. + /// + /// If none of `-b`, `-s`, or `-r` is provided, then the default is `-b @`. #[arg(long, short)] source: Vec, /// Rebase only this revision, rebasing descendants onto this revision's /// parent(s) + /// + /// 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) + /// The revision(s) to rebase onto (can be repeated to create a merge + /// commit) #[arg(long, short, required = true)] destination: Vec, /// Allow revsets expanding to multiple commits in a single argument (for