diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-04-22 07:10:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-22 07:10:20 (GMT) |
| commit | bdb87afb4b425d97f7b5e957cbed1589969d9a24 (patch) | |
| tree | 32b46fd09198fa1bc88d793992cfad5dfb6f00ef /Documentation | |
| parent | 799596a5d06f2abddef75940604d00c4bd8ba849 (diff) | |
| parent | 71bd81ade2973a304889d94426c922cc096019a2 (diff) | |
| download | git-bdb87afb4b425d97f7b5e957cbed1589969d9a24.zip git-bdb87afb4b425d97f7b5e957cbed1589969d9a24.tar.gz git-bdb87afb4b425d97f7b5e957cbed1589969d9a24.tar.bz2 | |
Merge branch 'maint'
* maint:
post-receive-email: fix accidental removal of a trailing space in signature line
Escape project names before creating pathinfo URLs
Escape project name in regexp
bash: Add completion for git diff --base --ours --theirs
diff-options.txt: document the new "--dirstat" option
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/diff-options.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 8dc5b00..01e7a57 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -58,6 +58,14 @@ endif::git-format-patch[] number of modified files, as well as number of added and deleted 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. + --summary:: Output a condensed summary of extended header information such as creations, renames and mode changes. |