From 01e0a4af0b6a915e6a4fe37c5600141a3c6b1bca Mon Sep 17 00:00:00 2001 From: Martin von Zweigbergk Date: Tue, 12 Mar 2024 22:15:59 -0700 Subject: [PATCH] next/prev: make first line of help text consistent This drops the trailing period for consistency with other commands, and rephrases them a bit for consistency between each other. --- cli/src/commands/next.rs | 3 +-- cli/src/commands/prev.rs | 2 +- cli/tests/cli-reference@.md.snap | 10 ++++------ 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/cli/src/commands/next.rs b/cli/src/commands/next.rs index 520f2fc697..b99fe0f5c1 100644 --- a/cli/src/commands/next.rs +++ b/cli/src/commands/next.rs @@ -23,8 +23,7 @@ use crate::cli_util::{short_commit_hash, CommandHelper, WorkspaceCommandHelper}; use crate::command_error::{user_error, CommandError}; use crate::ui::Ui; -/// Move the current working copy commit to the next child revision in the -/// repository. +/// Move the working-copy commit to the child revision /// /// The command moves you to the next child in a linear fashion. /// diff --git a/cli/src/commands/prev.rs b/cli/src/commands/prev.rs index 58af0e1ff9..60ee6cef0f 100644 --- a/cli/src/commands/prev.rs +++ b/cli/src/commands/prev.rs @@ -21,7 +21,7 @@ use crate::command_error::{user_error, CommandError}; use crate::commands::next::choose_commit; use crate::ui::Ui; -/// Move the working copy commit to the parent of the current revision. +/// Move the working-copy commit to the parent revision /// /// /// The command moves you to the parent in a linear fashion. diff --git a/cli/tests/cli-reference@.md.snap b/cli/tests/cli-reference@.md.snap index 5336ada266..18e86e888f 100644 --- a/cli/tests/cli-reference@.md.snap +++ b/cli/tests/cli-reference@.md.snap @@ -121,11 +121,10 @@ To get started, see the tutorial at https://github.com/martinvonz/jj/blob/main/d * `log` — Show revision history * `move` — Move changes from one revision into another * `new` — Create a new, empty change and (by default) edit it in the working copy -* `next` — Move the current working copy commit to the next child revision in the -repository. +* `next` — Move the working-copy commit to the child revision * `obslog` — Show how a change has evolved * `operation` — Commands for working with the operation log -* `prev` — Move the working copy commit to the parent of the current revision. +* `prev` — Move the working-copy commit to the parent revision * `rebase` — Move revisions to different parent(s) * `resolve` — Resolve a conflicted file with an external merge tool * `restore` — Restore paths from another revision @@ -1142,8 +1141,7 @@ For more information, see https://github.com/martinvonz/jj/blob/main/docs/workin ## `jj next` -Move the current working copy commit to the next child revision in the -repository. +Move the working-copy commit to the child revision The command moves you to the next child in a linear fashion. @@ -1346,7 +1344,7 @@ This restores the repo to the state at the specified operation, effectively undo ## `jj prev` -Move the working copy commit to the parent of the current revision. +Move the working-copy commit to the parent revision The command moves you to the parent in a linear fashion.