diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-04 14:59:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-04 14:59:07 -0700 |
| commit | f5bf1b5f6b43f5ed9263f4cecd0faf58c5a7322f (patch) | |
| tree | 974ffecbcfaa90e90a2d72ee98bcc11cf694723f /Documentation | |
| parent | 419272d87b7a611ea55736c284df9615d22ec6af (diff) | |
| parent | 2ca86714703f81f9dd5dfb31f8d97a8a0089634d (diff) | |
| download | git-f5bf1b5f6b43f5ed9263f4cecd0faf58c5a7322f.tar.gz git-f5bf1b5f6b43f5ed9263f4cecd0faf58c5a7322f.tar.xz | |
Merge branch 'jh/dirstat' into maint
* 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.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index c93124be7..7e4bd425e 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. |