sascha
/
difftastic
mirror of https://github.com/Wilfred/difftastic/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Document git diff conventions in --help

pull/894/head
Wilfred Hughes 2025-10-06 23:10:41 +07:00
parent 7a0e399454
commit 81c88ba1d6
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/options.rs
Unescape Escape View File

@ -108,8 +108,27 @@ fn app() -> clap::Command {
.to_string(),
);
after_help.push_str("\n\nDifftastic can also be invoked with 7 arguments in the format that GIT_EXTERNAL_DIFF expects.\n\n");
after_help.push_str("See the full manual at: https://difftastic.wilfred.me.uk/");
after_help.push_str("\n\nDifftastic can also be invoked with 7 or 9 arguments in the format that GIT_EXTERNAL_DIFF expects.\n\n");
after_help.push_str(
&format!(
"$ {} DISPLAY-PATH OLD-FILE OLD-HEX OLD-MODE NEW-FILE NEW-HEX NEW-MODE",
bin_name
)
.bold()
.to_string(),
);
after_help.push('\n');
after_help.push_str(
&format!(
"$ {} OLD-NAME OLD-FILE OLD-HEX OLD-MODE NEW-FILE NEW-HEX NEW-MODE NEW-NAME METADATA",
bin_name
)
.bold()
.to_string(),
);
after_help.push_str("\n\nSee the full manual at: https://difftastic.wilfred.me.uk/");
Command::new("Difftastic")
.override_usage(USAGE)
@ -850,7 +869,6 @@ pub(crate) fn parse_args() -> Mode {
}
}
// TODO: document these different ways of calling difftastic.
let (display_path, lhs_path, rhs_path, lhs_permissions, rhs_permissions, renamed) = match &args
[..]
{