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/git-merge-base.txt | |
parent | Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-file (diff) | |
download | tgif-2d17495196d0dceb0ff492aa97bfff33ef1baa18.tar.xz |
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/git-merge-base.txt')
0 files changed, 0 insertions, 0 deletions