Merge branch 'dz/mailinfo'

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

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index e112172ca57da75ce6c2dd447cc97c6aa2b6499e..d8696b7b36ff81f47214da9d7c4ec53142b97653 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,5 +140,24 @@
 -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
+       more white space characters to be equivalent.
+
+-b::
+       Shorthand for "--ignore-space-change".
+
+--ignore-all-space::
+       Ignore white space when comparing lines.  This ignores
+       difference even if one line has white space where the other
+       line has none.
+
+-w::
+       Shorthand for "--ignore-all-space".
+

 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].