X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fdiff-options.txt;h=5c85167ff26b40cb1c9d6f282eed268eb0457822;hb=50b4e0c178777a27164eb67676593255a9cbd035;hp=06500d04b7f56507cd8bc379cb34b91b7056bf18;hpb=952f87a6ca50a4d172bfb99c3c6e44e801212955;p=git.git

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 06500d04..5c85167f 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -4,10 +4,6 @@
 -u::
 	Synonym for "-p".
 
--r::
-	Look recursively in subdirectories; only used by "git-diff-tree";
-	other diff commands always work recursively.
-
 -z::
 	\0 line termination on output
 
@@ -17,6 +13,19 @@
 --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.	
+
+--abbrev[=<n>]::
+	Instead of showing the full 40-byte hexadecimal object
+	name in diff-raw format output and diff-tree header
+	lines, show only handful hexdigits prefix.  This is
+	independent of --full-index option above, which controls
+	the diff-patch output format.  Non default number of
+	digits can be specified with --abbrev=<n>.
+
 -B::
 	Break complete rewrite changes into pairs of delete and create.
 
@@ -54,7 +63,7 @@
 	<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