X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fdiff-options.txt;h=32005b03f3bee40413d7ff0d33e143de85b194c6;hb=54c2533da0228244bbde7f94abfdb0a7fbb859c1;hp=613a60d601df527bbd7a74717edfdc698ec35dd7;hpb=c1067050ce58b5b39f528fe634732da858664603;p=git.git diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 613a60d6..32005b03 100644 --- 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 @@ -28,26 +23,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:: -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:: - Look for differences that contains the change in . + Look for differences that contain the change in . --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 . -O::