From 75e938c6b8fabe809f4b2fe4edf61b59bac817ff Mon Sep 17 00:00:00 2001 From: Evan Mesterhazy Date: Sat, 30 Mar 2024 19:00:28 -0400 Subject: [PATCH] Fix the description of the --source arg in the jj rebase --help docs --- cli/src/commands/rebase.rs | 4 ++-- cli/tests/cli-reference@.md.snap | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/src/commands/rebase.rs b/cli/src/commands/rebase.rs index af3991b71..d1d5d6727 100644 --- a/cli/src/commands/rebase.rs +++ b/cli/src/commands/rebase.rs @@ -134,8 +134,8 @@ pub(crate) struct RebaseArgs { #[arg(long, short)] branch: Vec, - /// Rebase specified revision(s) together their tree of descendants (can be - /// repeated) + /// Rebase specified revision(s) together with their trees of descendants + /// (can be repeated) /// /// Each specified revision will become a direct child of the destination /// revision(s), even if some of the source revisions are descendants diff --git a/cli/tests/cli-reference@.md.snap b/cli/tests/cli-reference@.md.snap index dc7d797e9..c44c349b6 100644 --- a/cli/tests/cli-reference@.md.snap +++ b/cli/tests/cli-reference@.md.snap @@ -1482,7 +1482,7 @@ commit. This is true in general; it is not specific to this command. ###### **Options:** * `-b`, `--branch ` — Rebase the whole branch relative to destination's ancestors (can be repeated) -* `-s`, `--source ` — Rebase specified revision(s) together their tree of descendants (can be repeated) +* `-s`, `--source ` — Rebase specified revision(s) together with their trees of descendants (can be repeated) * `-r`, `--revision ` — Rebase only this revision, rebasing descendants onto this revision's parent(s) * `-d`, `--destination ` — The revision(s) to rebase onto (can be repeated to create a merge commit) * `--skip-empty` — If true, when rebasing would produce an empty commit, the commit is abandoned. It will not be abandoned if it was already empty before the rebase. Will never skip merge commits with multiple non-empty parents