Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

next/prev: make first line of help text consistent #3282

Merged
merged 1 commit into from
Mar 13, 2024
+6 −9
Merged

next/prev: make first line of help text consistent #3282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions cli/src/commands/next.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
///
Expand Down
2 changes: 1 addition & 1 deletion cli/src/commands/prev.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
10 changes: 4 additions & 6 deletions cli/tests/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.

Expand Down Expand Up @@ -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.
Expand Down