diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-08 06:33:26 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-08 06:33:26 (GMT) |
| commit | 5628a7a309e11c413138291b215a8cecedaddd24 (patch) | |
| tree | 1273cebf4c951b8c9cec3d7df9e47720abee494a /Documentation | |
| parent | 003b93cfb3f588284b89dc4e4c89e1046913ff59 (diff) | |
| parent | 94c22a5e7b4247d7d6453272c4425d81071d2689 (diff) | |
| download | git-5628a7a309e11c413138291b215a8cecedaddd24.zip git-5628a7a309e11c413138291b215a8cecedaddd24.tar.gz git-5628a7a309e11c413138291b215a8cecedaddd24.tar.bz2 | |
Merge branch 'dc/format-pretty'
* dc/format-pretty:
log/show/whatchanged: introduce format.pretty configuration
specify explicit "--pretty=medium" with `git log/show/whatchanged`
whatchanged documentation: share description of --pretty with others
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 5 | ||||
| -rw-r--r-- | Documentation/git-whatchanged.txt | 9 | ||||
| -rw-r--r-- | Documentation/pretty-options.txt | 3 |
3 files changed, 12 insertions, 5 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 29bc516..683a53a 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -556,6 +556,11 @@ format.suffix:: `.patch`. Use this variable to change that suffix (make sure to include the dot if you want it). +format.pretty:: + The default pretty format for log/show/whatchanged command, + See linkgit:git-log[1], linkgit:git-show[1], + linkgit:git-whatchanged[1]. + gc.aggressiveWindow:: The window size parameter used in the delta compression algorithm used by 'git gc --aggressive'. This defaults diff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt index 54947b6..a6e7bd4 100644 --- a/Documentation/git-whatchanged.txt +++ b/Documentation/git-whatchanged.txt @@ -38,11 +38,6 @@ OPTIONS Show git internal diff output, but for the whole tree, not just the top level. ---pretty=<format>:: - Controls the output format for the commit logs. - <format> can be one of 'raw', 'medium', 'short', 'full', - and 'oneline'. - -m:: By default, differences for merge commits are not shown. With this flag, show differences to that commit from all @@ -51,6 +46,10 @@ OPTIONS However, it is not very useful in general, although it *is* useful on a file-by-file basis. +include::pretty-options.txt[] + +include::pretty-formats.txt[] + Examples -------- git-whatchanged -p v2.6.12.. include/scsi drivers/scsi:: diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt index 973d8dd..6d66c74 100644 --- a/Documentation/pretty-options.txt +++ b/Documentation/pretty-options.txt @@ -4,6 +4,9 @@ where '<format>' can be one of 'oneline', 'short', 'medium', 'full', 'fuller', 'email', 'raw' and 'format:<string>'. When omitted, the format defaults to 'medium'. ++ +Note: you can specify the default pretty format in the repository +configuration (see linkgit:git-config[1]). --abbrev-commit:: Instead of showing the full 40-byte hexadecimal commit object |