Merge branch 'jc/fpl'

[git.git] / Documentation / diff-options.txt

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 9cdd171af74013340144ab60b703498001809502..1689c748171a8ff48395cf432aabe0130fc6b8d2 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -19,7 +19,14 @@
 --numstat::
        Similar to \--stat, but shows number of added and
        deleted lines in decimal notation and pathname without
 --numstat::
        Similar to \--stat, but shows number of added and
        deleted lines in decimal notation and pathname without

-       abbreviation, to make it more machine friendly.
+       abbreviation, to make it more machine friendly.  For
+       binary files, outputs two `-` instead of saying
+       `0 0`.
+
+--shortstat::
+       Output only the last line of the --stat format containing total
+       number of modified files, as well as number of added and deleted
+       lines.

 
 --summary::
        Output a condensed summary of extended header information
 
 --summary::
        Output a condensed summary of extended header information


@@ -51,6 +58,10 @@
        Turn off rename detection, even when the configuration
        file gives the default to do so.
 
        Turn off rename detection, even when the configuration
        file gives the default to do so.
 

+--check::
+       Warn if changes introduce trailing whitespace
+       or an indent that uses a space before a tab.
+

 --full-index::
        Instead of the first handful characters, show full
        object name of pre- and post-image blob on the "index"
 --full-index::
        Instead of the first handful characters, show full
        object name of pre- and post-image blob on the "index"


@@ -129,6 +140,9 @@
 -a::
        Shorthand for "--text".
 
 -a::
        Shorthand for "--text".
 

+--ignore-space-at-eol::
+       Ignore changes in white spaces at EOL.
+

 --ignore-space-change::
        Ignore changes in amount of white space.  This ignores white
        space at line end, and consider all other sequences of one or
 --ignore-space-change::
        Ignore changes in amount of white space.  This ignores white
        space at line end, and consider all other sequences of one or


@@ -145,5 +159,13 @@
 -w::
        Shorthand for "--ignore-all-space".
 
 -w::
        Shorthand for "--ignore-all-space".
 

+--exit-code::
+       Make the program exit with codes similar to diff(1).
+       That is, it exits with 1 if there were differences and
+       0 means no differences.
+
+--quiet::
+       Disable all output of the program. Implies --exit-code.
+

 For more detailed explanation on these common options, see also
 link:diffcore.html[diffcore documentation].
 For more detailed explanation on these common options, see also
 link:diffcore.html[diffcore documentation].