diff options
author | Johan Herland <johan@herland.net> | 2011-04-29 11:36:19 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-04-29 11:20:03 -0700 |
commit | 2d17495196d0dceb0ff492aa97bfff33ef1baa18 (patch) | |
tree | 010da01ffd0d5101ba2d3689553f07165302e3a7 /Documentation/diff-options.txt | |
parent | 333f3fb0c5307fed170cae336ab3c056f4d6ca1c (diff) | |
download | git-2d17495196d0dceb0ff492aa97bfff33ef1baa18.tar.gz |
Add config variable for specifying default --dirstat behavior
The new diff.dirstat config variable takes the same arguments as
'--dirstat=<args>', and specifies the default arguments for --dirstat.
The config is obviously overridden by --dirstat arguments passed on the
command line.
When not specified, the --dirstat defaults are 'changes,noncumulative,3'.
The patch also adds several tests verifying the interaction between the
diff.dirstat config variable, and the --dirstat command line option.
Improved-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-options.txt')
-rw-r--r-- | Documentation/diff-options.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 0962035faa..dc023523ee 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -70,6 +70,8 @@ endif::git-format-patch[] Output the distribution of relative amount of changes for each sub-directory. The behavior of `--dirstat` can be customized by passing it a comma separated list of parameters. + The defaults are controlled by the `diff.dirstat` configuration + variable (see linkgit:git-config[1]). The following parameters are available: + -- |