From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 6 Mar 2012 22:53:06 +0000 (-0800)
Subject: Merge branch 'zj/diff-stat-dyncol'
X-Git-Tag: v1.7.10-rc0~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=af050219e44051426179248614a046896b5d40c0;p=git.git

Merge branch 'zj/diff-stat-dyncol'

By Zbigniew Jędrzejewski-Szmek (8) and Junio C Hamano (1)
* zj/diff-stat-dyncol:
  : This breaks tests. Perhaps it is not worth using the decimal-width stuff
  : for this series, at least initially.
  diff --stat: add config option to limit graph width
  diff --stat: enable limiting of the graph part
  diff --stat: add a test for output with COLUMNS=40
  diff --stat: use a maximum of 5/8 for the filename part
  merge --stat: use the full terminal width
  log --stat: use the full terminal width
  show --stat: use the full terminal width
  diff --stat: use the full terminal width
  diff --stat: tests for long filenames and big change counts
---

af050219e44051426179248614a046896b5d40c0
diff --cc Documentation/diff-options.txt
index ba7cd1348,87f0a5fb8..7d4566f82
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@@ -52,17 -52,20 +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>`.