git-mv: fully detect 'directory moved into itself'

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 613a60d601df527bbd7a74717edfdc698ec35dd7..6b496ede2550cf573a3a7ce37db908e6b3ab631e 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -4,11 +4,6 @@
 -u::
        Synonym for "-p".
 
--r::
-       Look recursively in subdirectories; this flag does not
-       mean anything to commands other than "git-diff-tree";
-       other diff commands always look at all the subdirectories.
-
 -z::
        \0 line termination on output
 
@@ -18,6 +13,11 @@
 --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,26 +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
-       in the number of potential rename/copy targets.  This
+       is the number of potential rename/copy targets.  This
        option prevents rename/copy detection from running if
-       the number of rename/copy targets exceed the specified
+       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>::
@@ -55,7 +55,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