Merge branch 'master' of git://repo.or.cz/git-gui

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index d8696b7b36ff81f47214da9d7c4ec53142b97653..1689c748171a8ff48395cf432aabe0130fc6b8d2 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -159,5 +159,13 @@
 -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].