X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fdiff-options.txt;h=47ba9a403ae9379b87c54f0103297da9157237cb;hb=71c87795c3f724a88c2f1f95aa21f212efc69b66;hp=f523ec2fbea9a129294b960461c82382b41ac92d;hpb=6858d494926437ad7b7e9199ea39953eb90c7bab;p=git.git

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index f523ec2fb..47ba9a403 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -4,18 +4,21 @@
 -u::
 	Synonym for "-p".
 
+--raw::
+	Generate the raw format.
+
 --patch-with-raw::
-	Generate patch but keep also the default raw diff output.
+	Synonym for "-p --raw".
 
 --stat::
-	Generate a diffstat instead of a patch.
+	Generate a diffstat.
 
 --summary::
 	Output a condensed summary of extended header information
 	such as creations, renames and mode changes.
 
 --patch-with-stat::
-	Generate patch and prepend its diffstat.
+	Synonym for "-p --stat".
 
 -z::
 	\0 line termination on output
@@ -26,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
@@ -94,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].