Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-07-08 23:15:05 +0300
committerJunio C Hamano <gitster@pobox.com>2021-07-08 23:15:05 +0300
commit5ae1eb22c98b2e75437f8d524eaa9fc7959fa438 (patch)
tree32385840cc46af86810fbd23f2aaaa770afc848f /Documentation
parent693575c2d1d728146cd1304c5de2d0be5d0ef2fb (diff)
parenta0538e5c8baf9985a71d18a1495985441041efba (diff)
Merge branch 'dd/document-log-decorate-default'
Doc clean-up. * dd/document-log-decorate-default: doc/log: correct default for --decorate
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-log.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 1bbf865a1b..0498e7bacb 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -39,7 +39,9 @@ OPTIONS
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'.
+ shown. The option `--decorate` is short-hand for `--decorate=short`.
+ Default to configuration value of `log.decorate` if configured,
+ otherwise, `auto`.
--decorate-refs=<pattern>::
--decorate-refs-exclude=<pattern>::