Merge branch 'maint'

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

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 77a3f78dd75514667b77ae4e1dbbb3731b05a33d..b2a05937f9c57e3a6ec70849fcc7aeca277b103b 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -100,8 +100,8 @@
        that matches other criteria, nothing is selected.
 
 --find-copies-harder::
-       For performance reasons, by default, -C option finds copies only 
-       if the original file of the copy was modified in the same 
+       For performance reasons, by default, -C option finds copies only
+       if the original file of the copy was modified in the same
        changeset.  This flag makes the command
        inspect unmodified files as candidates for the source of
        copy.  This is a very expensive operation for large
@@ -164,5 +164,8 @@
        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].