diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-01 00:34:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-01 00:34:58 -0700 |
| commit | 12f9b8a3152ff9fa48464187a83f7c6279fe5094 (patch) | |
| tree | 8eac7b25900e69c2b332f39ad720698982de66c7 /Documentation/diff-options.txt | |
| parent | 2eaf22242f61b13c38c87cbb0e84c84974c52d66 (diff) | |
| parent | ba0ac36ec5708820e670731001f7ab35351c6c48 (diff) | |
| download | git-12f9b8a3152ff9fa48464187a83f7c6279fe5094.tar.gz git-12f9b8a3152ff9fa48464187a83f7c6279fe5094.tar.xz | |
Merge branch 'sb/fetch' into jc/refs-and-fetch
* sb/fetch: (41 commits)
merge and resolve: Output short hashes and .. in "Updating ..."
fetch: Misc output cleanup
gitweb: tree view: hash_base and hash are now context sensitive
fetch: Reset remote refs list each time fetch_main is called
Fix approxidate() to understand 12:34 AM/PM are 00:34 and 12:34
git-diff -B output fix.
Make cvsexportcommit remove files.
diff --stat: ensure at least one '-' for deletions, and one '+' for additions
diff --stat=width[,name-width]: allow custom diffstat output width.
gitweb: History: blob and tree are first, then commitdiff, etc
gitweb: Remove redundant "commit" from history
http/ftp: optionally ask curl to not use EPSV command
gitweb: Don't use quotemeta on internally generated strings
gitweb: Add snapshot to shortlog
gitweb: Factor out gitweb_have_snapshot()
gitweb: Remove redundant "commit" link from shortlog
gitweb: "alternate" starts with shade (i.e. 1)
git-format-patch: fix bug using -o in subdirectories
do not discard constness in interp_set_entry value argument
Fix approxidate() to understand more extended numbers
...
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 7 |
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 |