git-rev-list: add documentation for --parents, --no-merges

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index ec6811c71885a9aa0a28626c46e0645cd79864ac..47ba9a403ae9379b87c54f0103297da9157237cb 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -4,6 +4,22 @@
 -u::
        Synonym for "-p".
 
+--raw::
+       Generate the raw format.
+
+--patch-with-raw::
+       Synonym for "-p --raw".
+
+--stat::
+       Generate a diffstat.
+
+--summary::
+       Output a condensed summary of extended header information
+       such as creations, renames and mode changes.
+
+--patch-with-stat::
+       Synonym for "-p --stat".
+
 -z::
        \0 line termination on output
 
@@ -13,10 +29,25 @@
 --name-status::
        Show only names and status of changed files.
 
+--color::
+       Show colored diff.
+
+--no-color::
+       Turn off colored diff, even when the configuration file
+       gives the default to color output.
+
+--no-renames::
+       Turn off rename detection, even when the configuration
+       file gives the default to do so.
+
 --full-index::
        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.     
+       line when generating a patch format output.
+
+--binary::
+       In addition to --full-index, output "binary diff" that
+       can be applied with "git apply".
 
 --abbrev[=<n>]::
        Instead of showing the full 40-byte hexadecimal object
@@ -81,5 +112,11 @@
        Swap two inputs; that is, show differences from index or
        on-disk file to tree contents.
 
+--text::
+       Treat all files as text.
+
+-a::
+       Shorthand for "--text".
+
 For more detailed explanation on these common options, see also
 link:diffcore.html[diffcore documentation].