diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-06-29 17:03:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-06-29 17:03:10 -0700 |
| commit | a852aac48d881d538e24d5493e218a93b12b1709 (patch) | |
| tree | 9444d09ddf9301428842a6e424832eec458f5c92 /Documentation/diff-options.txt | |
| parent | 0faf247485c2dc92fd8b492a5c4b49237e0338ee (diff) | |
| parent | e5f85df87e8f1adb40288265ef54a16128691688 (diff) | |
| download | git-a852aac48d881d538e24d5493e218a93b12b1709.tar.gz | |
Merge branch 'mg/diff-stat-count'
* mg/diff-stat-count:
diff --stat-count: finishing touches
diff-options.txt: describe --stat-{width,name-width,count}
diff: introduce --stat-lines to limit the stat lines
diff.c: omit hidden entries from namelen calculation with --stat
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 24f189f96b..4235302ea4 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -48,11 +48,17 @@ endif::git-format-patch[] --patience:: Generate a diff using the "patience diff" algorithm. ---stat[=<width>[,<name-width>]]:: +--stat[=<width>[,<name-width>[,<count>]]]:: Generate a diffstat. You can override the default output width for 80-column terminal by `--stat=<width>`. The width of the filename part can be controlled by giving another width to it separated by a comma. + By giving a third parameter `<count>`, you can limit the + output to the first `<count>` lines, followed by + `...` if there are more. ++ +These parameters can also be set individually with `--stat-width=<width>`, +`--stat-name-width=<name-width>` and `--stat-count=<count>`. --numstat:: Similar to `\--stat`, but shows number of added and |