aboutsummaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-03-07 22:33:26 -0800
committerJunio C Hamano <gitster@pobox.com>2008-03-07 22:33:26 -0800
commit5628a7a309e11c413138291b215a8cecedaddd24 (patch)
tree1273cebf4c951b8c9cec3d7df9e47720abee494a /Documentation/config.txt
parent003b93cfb3f588284b89dc4e4c89e1046913ff59 (diff)
parent94c22a5e7b4247d7d6453272c4425d81071d2689 (diff)
downloadgit-5628a7a309e11c413138291b215a8cecedaddd24.tar.gz
git-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/config.txt')
-rw-r--r--Documentation/config.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 29bc51603..683a53a0b 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