mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-12 15:16:35 +00:00
jj help
: note that move
, checkout
, and merge
as deprecated
This commit is contained in:
parent
ab195339b4
commit
21b9453d59
3 changed files with 4 additions and 3 deletions
|
@ -20,7 +20,8 @@ use crate::command_error::CommandError;
|
|||
use crate::description_util::join_message_paragraphs;
|
||||
use crate::ui::Ui;
|
||||
|
||||
/// Create a new, empty change and edit it in the working copy
|
||||
/// Create a new, empty change and edit it in the working copy (DEPRECATED, use
|
||||
/// `jj new`)
|
||||
///
|
||||
/// For more information, see
|
||||
/// https://github.com/martinvonz/jj/blob/main/docs/working-copy.md.
|
||||
|
|
|
@ -97,7 +97,7 @@ enum Command {
|
|||
Init(init::InitArgs),
|
||||
Interdiff(interdiff::InterdiffArgs),
|
||||
Log(log::LogArgs),
|
||||
/// Merge work from multiple branches
|
||||
/// Merge work from multiple branches (DEPRECATED, use `jj new`)
|
||||
///
|
||||
/// Unlike most other VCSs, `jj merge` does not implicitly include the
|
||||
/// working copy revision's parent as one of the parents of the merge;
|
||||
|
|
|
@ -21,7 +21,7 @@ use crate::cli_util::{CommandHelper, RevisionArg};
|
|||
use crate::command_error::{user_error, CommandError};
|
||||
use crate::ui::Ui;
|
||||
|
||||
/// Move changes from one revision into another
|
||||
/// Move changes from one revision into another (DEPRECATED, use `jj squash`)
|
||||
///
|
||||
/// Use `--interactive` to move only part of the source revision into the
|
||||
/// destination. The selected changes (or all the changes in the source revision
|
||||
|
|
Loading…
Reference in a new issue