X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fdiff-options.txt;h=6b496ede2550cf573a3a7ce37db908e6b3ab631e;hb=d28c8af623b0d15740c2af0106d8e2bf54a3ac52;hp=58b9c46c20a6998e5b5abb3e1e396f51d820ace1;hpb=89ab859e9452cbc8f1f15afab52257e9b789c899;p=git.git

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 58b9c46c..6b496ede 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -4,19 +4,19 @@
 -u::
 	Synonym for "-p".
 
--r::
-	Look recursivelly in subdirectories; this flag does not
-	mean anything to commands other than "git-diff-tree";
-	other commands always looks at all the subdirectories.
-
 -z::
 	\0 line termination on output
 
 --name-only::
 	Show only names of changed files.
 
---name-only-z::
-	Same as --name-only, but terminate lines with NUL.
+--name-status::
+	Show only names and status of changed files.
+
+--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.	
 
 -B::
 	Break complete rewrite changes into pairs of delete and create.
@@ -28,19 +28,26 @@
 	Detect copies as well as renames.
 
 --find-copies-harder::
-	By default, -C option finds copies only if the original
-	file of the copy was modified in the same changeset for
-	performance reasons.  This flag makes the command
+	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
 	projects, so use it with caution.
 
+-l<num>::
+	-M and -C options require O(n^2) processing time where n
+	is the number of potential rename/copy targets.  This
+	option prevents rename/copy detection from running if
+	the number of rename/copy targets exceeds the specified
+	number.
+
 -S<string>::
-	Look for differences that contains the change in <string>.
+	Look for differences that contain the change in <string>.
 
 --pickaxe-all::
 	When -S finds a change, show all the changes in that
-	changeset, not just the files that contains the change
+	changeset, not just the files that contain the change
 	in <string>.
 
 -O<orderfile>::
@@ -48,6 +55,8 @@
 	<orderfile>, which has one shell glob pattern per line.
 
 -R::
-	Swap two inputs; that is, show differences from cache or
+	Swap two inputs; that is, show differences from index or
 	on-disk file to tree contents.
 
+For more detailed explanation on these common options, see also
+link:diffcore.html[diffcore documentation].