diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-03 00:10:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-03 00:10:08 (GMT) |
| commit | 106db883b791efb7f39f3b2f8553236ba792a89e (patch) | |
| tree | 4589463a8d7a3f2f42bfc1bb0ef72d0ad7c852a3 /Documentation/diff-options.txt | |
| parent | 7f314565fe20e324e8db1a7c233e43ca4e3683f0 (diff) | |
| parent | db3a95459cb873c302051b4b2b693be5ba248c13 (diff) | |
| download | git-106db883b791efb7f39f3b2f8553236ba792a89e.zip git-106db883b791efb7f39f3b2f8553236ba792a89e.tar.gz git-106db883b791efb7f39f3b2f8553236ba792a89e.tar.bz2 | |
Merge branch 'maint'
* maint:
Makefile: add merge_recursive.h to LIB_H
Improve documentation for --dirstat diff option
Bring local clone's origin URL in line with that of a remote clone
Documentation: minor cleanup in a use case in 'git stash' manual
Documentation: fix disappeared lines in 'git stash' manpage
Documentation: fix reference to a for-each-ref option
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 1759386..6e26832 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -59,12 +59,11 @@ endif::git-format-patch[] lines. --dirstat[=limit]:: - Output only the sub-directories that are impacted by a diff, - and to what degree they are impacted. You can override the - default cut-off in percent (3) by "--dirstat=limit". If you - want to enable "cumulative" directory statistics, you can use - the "--cumulative" flag, which adds up percentages recursively - even when they have been already reported for a sub-directory. + Output the distribution of relative amount of changes (number of lines added or + removed) for each sub-directory. Directories with changes below + 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 is not + counted for the parent directory, unless "--cumulative" is used. --summary:: Output a condensed summary of extended header information |