path: root/Documentation/diff-options.txt
diff options
Diffstat (limited to 'Documentation/diff-options.txt')
1 files changed, 10 insertions, 17 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 45885bb..b432d25 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -19,16 +19,12 @@ endif::git-format-patch[]
Generate patch (see section on generating patches).
{git-diff? This is the default.}
- Synonym for "-p".
- Shorthand for "--unified=<n>".
Generate diffs with <n> lines of context instead of
the usual three. Implies "-p".
@@ -65,6 +61,9 @@ endif::git-format-patch[]
can be set with "--dirstat=limit". Changes in a child directory is not
counted for the parent directory, unless "--cumulative" is used.
+ Same as --dirstat, but counts changed files instead of lines.
Output a condensed summary of extended header information
such as creations, renames and mode changes.
@@ -106,9 +105,9 @@ endif::git-format-patch[]
- Instead of the first handful characters, show full
- object name of pre- and post-image blob on the "index"
- line when generating a patch format output.
+ Instead of the first handful of characters, show the full
+ pre- and post-image blob object names on the "index"
+ line when generating patch format output.
In addition to --full-index, output "binary diff" that
@@ -187,31 +186,25 @@ endif::git-format-patch[]
can name which subdirectory to make the output relative
to by giving a <path> as an argument.
Treat all files as text.
- Shorthand for "--text".
Ignore changes in whitespace at EOL.
Ignore changes in amount of whitespace. This ignores whitespace
at line end, and considers all other sequences of one or
more whitespace characters to be equivalent.
- Shorthand for "--ignore-space-change".
Ignore whitespace when comparing lines. This ignores
differences even if one line has whitespace where the other
line has none.
- Shorthand for "--ignore-all-space".
Make the program exit with codes similar to diff(1).
That is, it exits with 1 if there were differences and