summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Davison <dandavison7@gmail.com>2024-08-16 09:08:13 -0400
committerDan Davison <dandavison7@gmail.com>2024-08-16 09:08:13 -0400
commit3f9805274d42adb5a1dc343e2a8b5b68e0a2f0e2 (patch)
treeac4f8f164894103fe6993d207db6bf231024f33c
parent66b7a9e89e828d4b2f6718ca72db3b54609734fc (diff)
Update --help in manual
-rw-r--r--manual/src/full---help-output.md19
1 files changed, 17 insertions, 2 deletions
diff --git a/manual/src/full---help-output.md b/manual/src/full---help-output.md
index b3095dc..cbced78 100644
--- a/manual/src/full---help-output.md
+++ b/manual/src/full---help-output.md
@@ -7,12 +7,14 @@ Usage: delta [OPTIONS] [MINUS_FILE] [PLUS_FILE]
Arguments:
[MINUS_FILE]
- First file to be compared when delta is being used in diff mode
+ First file to be compared when delta is being used to diff two
+ files.
`delta file1 file2` is equivalent to `diff -u file1 file2 | delta`.
[PLUS_FILE]
- Second file to be compared when delta is being used in diff mode
+ Second file to be compared when delta is being used to diff two
+ files
Options:
--blame-code-style <STYLE>
@@ -153,6 +155,19 @@ Options:
- always: Always query the terminal for its colors
- never: Never query the terminal for its colors
+ -@, --diff-args <STRING>
+ Extra arguments to pass to `git diff` when using delta to diff two
+ files.
+
+ E.g. `delta --diff-args=-U999 file_1 file_2` is equivalent to `git
+ diff --no-index --color -U999 file_1 file_2 | delta`.
+
+ If you use process substitution (`delta <(command_1) <(command_2)`)
+ and your git version doesn't support it, then delta will fall back
+ to `diff` instead of `git diff`.
+
+ [default: ]
+
--diff-highlight
Emulate diff-highlight.