summaryrefslogtreecommitdiff
path: root/Documentation/pretty-options.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-03-07 22:33:26 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-03-07 22:33:26 -0800
commit5628a7a309e11c413138291b215a8cecedaddd24 (patch)
tree1273cebf4c951b8c9cec3d7df9e47720abee494a /Documentation/pretty-options.txt
parentMerge branch 'cb/mergetool' (diff)
parentlog/show/whatchanged: introduce format.pretty configuration (diff)
downloadtgif-5628a7a309e11c413138291b215a8cecedaddd24.tar.xz
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/pretty-options.txt')
-rw-r--r--Documentation/pretty-options.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt
index 973d8dd733..6d66c74cc1 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