diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-03-06 16:17:11 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-03-06 16:17:11 -0800 |
commit | aea9e6b364b7c38ed3c87ac94e7dc1e7ba7f9ed6 (patch) | |
tree | 2d3feab64e90e242ac9d4cfad66ce8b04c99073b /diff-options.txt | |
parent | a5a6216a7e57659294099a18eb1b55a213f2b951 (diff) | |
download | git-htmldocs-aea9e6b364b7c38ed3c87ac94e7dc1e7ba7f9ed6.tar.gz |
Autogenerated HTML docs for v1.7.9.3-362-g71319
Diffstat (limited to 'diff-options.txt')
-rw-r--r-- | diff-options.txt | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/diff-options.txt b/diff-options.txt index 9f7cba2be..7d4566f82 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -52,14 +52,23 @@ endif::git-format-patch[] --patience:: Generate a diff using the "patience diff" algorithm. +--histogram:: + Generate a diff using the "histogram diff" algorithm. + --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. + Generate a diffstat. By default, as much space as necessary + will be used for the filename part, and the rest for the graph + part. Maximum width defaults to terminal width, or 80 columns + if not connected to a terminal, and can be overriden by + `<width>`. The width of the filename part can be limited by + giving another width `<name-width>` after a comma. The width + of the graph part can be limited by using + `--stat-graph-width=<width>` (affects all commands generating + a stat graph) or by setting `diff.statGraphWidth=<width>` + (does not affect `git format-patch`). By giving a third parameter `<count>`, you can limit the - output to the first `<count>` lines, followed by - `...` if there are more. + 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>`. |