Skip to content

Commit

Permalink
docstrings: matching updates to help for restore and abandon
Browse files Browse the repository at this point in the history
  • Loading branch information
ilyagr committed May 24, 2023
1 parent d384ca3 commit 558e3de
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions src/commands/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -456,8 +456,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
Expand Down Expand Up @@ -630,11 +630,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
Expand Down

0 comments on commit 558e3de

Please sign in to comment.