path: root/Documentation
diff options
authorJunio C Hamano <>2008-03-08 06:33:26 (GMT)
committerJunio C Hamano <>2008-03-08 06:33:26 (GMT)
commit5628a7a309e11c413138291b215a8cecedaddd24 (patch)
tree1273cebf4c951b8c9cec3d7df9e47720abee494a /Documentation
parent003b93cfb3f588284b89dc4e4c89e1046913ff59 (diff)
parent94c22a5e7b4247d7d6453272c4425d81071d2689 (diff)
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')
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).
+ The default pretty format for log/show/whatchanged command,
+ See linkgit:git-log[1], linkgit:git-show[1],
+ linkgit:git-whatchanged[1].
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.
- Controls the output format for the commit logs.
- <format> can be one of 'raw', 'medium', 'short', 'full',
- and 'oneline'.
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.
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]).
Instead of showing the full 40-byte hexadecimal commit object