From 379caf2d544efa73363b1e7de9a312e2eb1e1b3c Mon Sep 17 00:00:00 2001 From: Ilya Grigoriev Date: Mon, 20 Feb 2023 19:20:18 -0800 Subject: [PATCH] docstrings: matching updates to help for `restore` and `abandon` --- src/commands/mod.rs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/commands/mod.rs b/src/commands/mod.rs index acf9a9774d..fca4e4840a 100644 --- a/src/commands/mod.rs +++ b/src/commands/mod.rs @@ -477,8 +477,8 @@ struct DuplicateArgs { /// Abandon a revision /// /// Abandon a revision, rebasing descendants onto its parent(s). The behavior is -/// similar to `jj restore`; the difference is that `jj abandon` gives you a new -/// change, while `jj restore` updates the existing change. +/// similar to `jj restore -r`; the difference is that `jj abandon` gives you a +/// new change, while `jj restore` updates the existing change. #[derive(clap::Args, Clone, Debug)] struct AbandonArgs { /// The revision(s) to abandon @@ -677,11 +677,13 @@ struct ResolveArgs { /// Restore paths from another revision /// -/// With the `-r` option, which is the default, restores a revision from its -/// parents. +/// With the `-r` option, which is the default, restores the given paths in a +/// revision from its parents. /// -/// If `--to` and/or `--from` are specified, restores one revision from the -/// content of another revision. +/// If no paths are given, all the paths will be restored. `jj rebase -r rev` +/// will make `rev` an empty revision. If you'd like to get rid of a revision +/// entirely, use `jj abandon`. If `--to` and/or `--from` are specified, +/// restores one revision from the content of another revision. /// /// That means that the paths get the same content in the destination (`--to`) /// as they had in the source (`--from`). This is typically used for undoing