From: Junio C Hamano
Date: Sun, 1 Oct 2006 05:40:29 +0000 (+0000)
Subject: Autogenerated HTML docs for v1.4.2.1-gdd0c36
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4a9a76a522b929156d4a9368f30967cc838eabbd;p=git.git
Autogenerated HTML docs for v1.4.2.1-gdd0c36
---
diff --git a/diff-options.txt b/diff-options.txt
index b5d976359..7b7b9e8ce 100644
--- a/diff-options.txt
+++ b/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
diff --git a/git-diff-files.html b/git-diff-files.html
index b46509ada..b6dd84e11 100644
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -317,11 +317,14 @@ same as "git-diff-index" and "git-diff-tree".
---stat
+--stat[=width[,name-width]]
- Generate a diffstat.
+ 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.
@@ -914,7 +917,7 @@ two unresolved merge parents with the working tree file