summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-04-28 14:11:19 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-04-28 14:11:19 -0700
commitd98a509ec3e9ff22bb642f778900691d0c715ba9 (patch)
tree3012de7f8c713f9250ffd090c64b6b2d9dce19d0 /Documentation
parentMerge branch 'sp/maint-clear-postfields' (diff)
parent--dirstat: In case of renames, use target filename instead of source filename (diff)
downloadtgif-d98a509ec3e9ff22bb642f778900691d0c715ba9.tar.xz
Merge branch 'jh/dirstat'
* jh/dirstat: --dirstat: In case of renames, use target filename instead of source filename Teach --dirstat not to completely ignore rearranged lines within a file --dirstat-by-file: Make it faster and more correct --dirstat: Describe non-obvious differences relative to --stat or regular diff
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/diff-options.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index c93124be79..7e4bd425e1 100644
--- 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.