doc/log: correct default for --decorate
There're two different default options for log --decorate: * Should `--decorate` be given without any arguments, it's default to `short` * Should neither `--decorate` nor `--no-decorate` be given, it's default to the `log.decorate` or `auto`. We documented the former, but not the latter. Let's document them, too. Reported-by: Andy AO <zen96285@gmail.com> Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Đoàn Trần Công Danh committed
Jun 8, 2021 at 08:58 UTC
a0538e5c8baf9985a71d18a1495985441041efba
1 file changed
+3
-1
Documentation/git-log.txt
+3
-1
@@ -39,7 +39,9 @@ OPTIONS
39
full ref name (including prefix) will be printed. If 'auto' is
40
specified, then if the output is going to a terminal, the ref names
41
are shown as if 'short' were given, otherwise no ref names are
42
- shown. The default option is 'short'.
42
+ shown. The option `--decorate` is short-hand for `--decorate=short`.
43
+ Default to configuration value of `log.decorate` if configured,
44
+ otherwise, `auto`.
45
46
--decorate-refs=<pattern>::
47
--decorate-refs-exclude=<pattern>::