Merge branch 'en/merge-recursive'

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index c93124be79809e36d9a29fd69ce77cd7f22413e1..7e4bd425e1fec23bbca0e89a0d7b4f53cf4f4483 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -72,6 +72,10 @@ endif::git-format-patch[]
        a cut-off percent (3% by default) are not shown. The cut-off percent
        can be set with `--dirstat=<limit>`. Changes in a child directory are not
        counted for the parent directory, unless `--cumulative` is used.
++
+Note that the `--dirstat` option computes the changes while ignoring
+the amount of pure code movements within a file.  In other words,
+rearranging lines in a file is not counted as much as other changes.
 
 --dirstat-by-file[=<limit>]::
        Same as `--dirstat`, but counts changed files instead of lines.