martinvonz/jj
1
1
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2024-09-20 02:07:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

cli diff help: add detailed explanation of -r merge_commit

Browse Source
This commit is contained in:
Ilya Grigoriev 2023-11-20 16:46:55 -08:00
parent e3852ffd55
commit d8df36b9a2
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli/src/commands/diff.rs
View File

@ -23,6 +23,10 @@ use crate::ui::Ui;
#[derive(clap::Args, Clone, Debug)]
pub(crate) struct DiffArgs {
/// Show changes in this revision, compared to its parent(s)
///
/// If the revision is a merge commit, this shows changes *from* the
/// automatic merge of the contents of all of its parents *to* the contents
/// of the revision itself.
#[arg(long, short)]
revision: Option<RevisionArg>,
/// Show changes from this revision