summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorLibravatar Ramsay Jones <ramsay@ramsayjones.plus.com>2016-05-27 16:56:02 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-05-27 13:16:47 -0700
commit462cbb415e41aa890e78a30a5cc29558baa80b23 (patch)
tree1515b9c611d9a71785f65f97a66a071ba490befa /Documentation/config.txt
parentMerge branch 'maint-2.0' into maint-2.1 (diff)
downloadtgif-462cbb415e41aa890e78a30a5cc29558baa80b23.tar.xz
log: document the --decorate=auto option
Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0a4d22aaf7..cbbb524b63 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1699,7 +1699,10 @@ log.decorate::
command. If 'short' is specified, the ref name prefixes 'refs/heads/',
'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is
specified, the full ref name (including prefix) will be printed.
- This is the same as the log commands '--decorate' option.
+ If 'auto' is specified, then if the output is going to a terminal,
+ the ref names are shown as if 'short' were given, otherwise no ref
+ names are shown. This is the same as the '--decorate' option
+ of the `git log`.
log.showroot::
If true, the initial commit will be shown as a big creation event.