mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-11 23:08:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

docs(commands): adjust option help text for jj rebase

Browse source
This commit is contained in:
Waleed Khan 2023-06-12 14:06:49 -07:00
parent abe5d098c5
commit 9963879d15
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/commands/mod.rs
View file

@ -783,6 +783,8 @@ struct RebaseArgs {
/// ///
/// `jj rebase -b=br -d=dst` is equivalent to `jj rebase '-s=roots(dst..br)' /// `jj rebase -b=br -d=dst` is equivalent to `jj rebase '-s=roots(dst..br)'
/// -d=dst`. /// -d=dst`.
///
/// If none of `-b`, `-s`, or `-r` is provided, then the default is `-b @`.
#[arg(long, short)] #[arg(long, short)]
branch: Vec<RevisionArg>, branch: Vec<RevisionArg>,
@ -792,13 +794,18 @@ struct RebaseArgs {
/// Each specified revision will become a direct child of the destination /// Each specified revision will become a direct child of the destination
/// revision(s), even if some of the source revisions are descendants /// revision(s), even if some of the source revisions are descendants
/// of others. /// of others.
///
/// If none of `-b`, `-s`, or `-r` is provided, then the default is `-b @`.
#[arg(long, short)] #[arg(long, short)]
source: Vec<RevisionArg>, source: Vec<RevisionArg>,
/// Rebase only this revision, rebasing descendants onto this revision's /// Rebase only this revision, rebasing descendants onto this revision's
/// parent(s) /// parent(s)
///
/// If none of `-b`, `-s`, or `-r` is provided, then the default is `-b @`.
#[arg(long, short)] #[arg(long, short)]
revision: Option<RevisionArg>, revision: Option<RevisionArg>,
/// 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)] #[arg(long, short, required = true)]
destination: Vec<RevisionArg>, destination: Vec<RevisionArg>,
/// Allow revsets expanding to multiple commits in a single argument (for /// Allow revsets expanding to multiple commits in a single argument (for