summaryrefslogtreecommitdiff
path: root/Documentation/git-log.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/git-log.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/git-log.txt')
-rw-r--r--Documentation/git-log.txt8
1 files changed, 5 insertions, 3 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 1f7bc67d6c..9a9f67c8b0 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -29,12 +29,14 @@ OPTIONS
(works only for a single file).
--no-decorate::
---decorate[=short|full|no]::
+--decorate[=short|full|auto|no]::
Print out the ref names of any commits that are shown. 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. The default option
- is 'short'.
+ full ref name (including prefix) will be printed. 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. The default option is 'short'.
--source::
Print out the ref name given on the command line by which each