aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-09-30 21:29:18 -0700
committerJunio C Hamano <junkio@cox.net>2006-09-30 21:29:18 -0700
commitdd0c367e5e1358539bdd11c3a474bb6792504d30 (patch)
tree017500fe3b098f45aef29f46691bc9b6a985b4f8 /Documentation
parent99692dc213482116f237ea58965b0ceef3827147 (diff)
parent3ed74e608a69ce0f10bfad2e4ef6cf99eec04613 (diff)
downloadgit-dd0c367e5e1358539bdd11c3a474bb6792504d30.tar.gz
git-dd0c367e5e1358539bdd11c3a474bb6792504d30.tar.xz
Merge branch 'jc/diff-stat'
* jc/diff-stat: diff --stat: ensure at least one '-' for deletions, and one '+' for additions diff --stat=width[,name-width]: allow custom diffstat output width. diff --stat: color output. diff --stat: allow custom diffstat output width.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/diff-options.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index b5d976359..7b7b9e8ce 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -10,8 +10,11 @@
--patch-with-raw::
Synonym for "-p --raw".
---stat::
- Generate a diffstat.
+--stat[=width[,name-width]]::
+ 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.
--summary::
Output a condensed summary of extended header information