Git development
 help / color / mirror / Atom feed
* [PATCH 0/2] doc: log: fix --decorate description list
@ 2026-04-27 19:06 kristofferhaugsbakk
  2026-04-27 19:06 ` [PATCH 1/2] " kristofferhaugsbakk
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: kristofferhaugsbakk @ 2026-04-27 19:06 UTC (permalink / raw)
  To: git; +Cc: Kristoffer Haugsbakk, Jean-Noël Avila

From: Kristoffer Haugsbakk <code@khaugsbakk.name>

Topic name: kh/doc-log-decorate-list

Topic summary: Fix formatting of the '--decorate' description list.

[1/2] doc: log: fix --decorate description list
[2/2] doc: log: use the same delimiter in description list

 Documentation/git-log.adoc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


base-commit: 67ad42147a7acc2af6074753ebd03d904476118f
-- 
2.54.0.13.g9c7419e39f8


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 1/2] doc: log: fix --decorate description list
  2026-04-27 19:06 [PATCH 0/2] doc: log: fix --decorate description list kristofferhaugsbakk
@ 2026-04-27 19:06 ` kristofferhaugsbakk
  2026-04-27 19:06 ` [PATCH 2/2] doc: log: use the same delimiter in " kristofferhaugsbakk
  2026-05-12  6:03 ` [PATCH 0/2] doc: log: fix --decorate " Junio C Hamano
  2 siblings, 0 replies; 4+ messages in thread
From: kristofferhaugsbakk @ 2026-04-27 19:06 UTC (permalink / raw)
  To: git; +Cc: Kristoffer Haugsbakk, Jean-Noël Avila

From: Kristoffer Haugsbakk <code@khaugsbakk.name>

026f2e3b (doc: convert git-log to new documentation format, 2025-07-07)
transformed the inline description of `--decorate` options to a
description list:

    We also transform inline descriptions of possible values of option
    --decorate into a list, which is more readable and extensible.

But a source code block was used instead of an open block.

Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
---
 Documentation/git-log.adoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/git-log.adoc b/Documentation/git-log.adoc
index e304739c5e8..1c95499060d 100644
--- a/Documentation/git-log.adoc
+++ b/Documentation/git-log.adoc
@@ -36,14 +36,14 @@ OPTIONS
 	Print out the ref names of any commits that are shown. Possible values
 	are:
 +
-----
+--
 `short`;; the ref name prefixes `refs/heads/`, `refs/tags/` and
 	`refs/remotes/` are not printed.
 `full`;; the full ref name (including prefix) is printed.
 `auto`:: 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 option `--decorate` is short-hand for `--decorate=short`. Default to
 configuration value of `log.decorate` if configured, otherwise, `auto`.
-- 
2.54.0.13.g9c7419e39f8


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 2/2] doc: log: use the same delimiter in description list
  2026-04-27 19:06 [PATCH 0/2] doc: log: fix --decorate description list kristofferhaugsbakk
  2026-04-27 19:06 ` [PATCH 1/2] " kristofferhaugsbakk
@ 2026-04-27 19:06 ` kristofferhaugsbakk
  2026-05-12  6:03 ` [PATCH 0/2] doc: log: fix --decorate " Junio C Hamano
  2 siblings, 0 replies; 4+ messages in thread
From: kristofferhaugsbakk @ 2026-04-27 19:06 UTC (permalink / raw)
  To: git; +Cc: Kristoffer Haugsbakk, Jean-Noël Avila

From: Kristoffer Haugsbakk <code@khaugsbakk.name>

We must use the same delimiter since this is a meant to be a flat
list. Introducing a new legal delimiter like `::` makes an inner
description list:

    ...
    full
    the full ref name ...

        auto
        if the output ...

Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
---
 Documentation/git-log.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/git-log.adoc b/Documentation/git-log.adoc
index 1c95499060d..fb3ac112839 100644
--- a/Documentation/git-log.adoc
+++ b/Documentation/git-log.adoc
@@ -40,7 +40,7 @@ OPTIONS
 `short`;; the ref name prefixes `refs/heads/`, `refs/tags/` and
 	`refs/remotes/` are not printed.
 `full`;; the full ref name (including prefix) is printed.
-`auto`:: if the output is going to a terminal, the ref names
+`auto`;; if the output is going to a terminal, the ref names
 	are shown as if `short` were given, otherwise no ref names are
 	shown.
 --
-- 
2.54.0.13.g9c7419e39f8


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 0/2] doc: log: fix --decorate description list
  2026-04-27 19:06 [PATCH 0/2] doc: log: fix --decorate description list kristofferhaugsbakk
  2026-04-27 19:06 ` [PATCH 1/2] " kristofferhaugsbakk
  2026-04-27 19:06 ` [PATCH 2/2] doc: log: use the same delimiter in " kristofferhaugsbakk
@ 2026-05-12  6:03 ` Junio C Hamano
  2 siblings, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2026-05-12  6:03 UTC (permalink / raw)
  To: kristofferhaugsbakk; +Cc: git, Kristoffer Haugsbakk, Jean-Noël Avila

kristofferhaugsbakk@fastmail.com writes:

> From: Kristoffer Haugsbakk <code@khaugsbakk.name>
>
> Topic name: kh/doc-log-decorate-list
>
> Topic summary: Fix formatting of the '--decorate' description list.
>
> [1/2] doc: log: fix --decorate description list
> [2/2] doc: log: use the same delimiter in description list
>
>  Documentation/git-log.adoc | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
>
> base-commit: 67ad42147a7acc2af6074753ebd03d904476118f

This does give us a solid improvement.  Let me mark the topic for
'next'.

Thanks.

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2026-05-12  6:03 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-04-27 19:06 [PATCH 0/2] doc: log: fix --decorate description list kristofferhaugsbakk
2026-04-27 19:06 ` [PATCH 1/2] " kristofferhaugsbakk
2026-04-27 19:06 ` [PATCH 2/2] doc: log: use the same delimiter in " kristofferhaugsbakk
2026-05-12  6:03 ` [PATCH 0/2] doc: log: fix --decorate " Junio C Hamano

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox