* [PATCH] doc: column: fix blank lines before block delimiters
@ 2025-05-31 21:08 kristofferhaugsbakk
2025-05-31 21:46 ` Jean-Noël AVILA
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: kristofferhaugsbakk @ 2025-05-31 21:08 UTC (permalink / raw)
To: git; +Cc: Kristoffer Haugsbakk, Jean-Noël Avila
From: Kristoffer Haugsbakk <code@khaugsbakk.name>
227c4f33a03 (doc: add a blank line around block delimiters,
2025-03-09) added blank lines around block delimiters as a
defensive measure. For each block you had to mind the con-
text (like the commit says):
• Top-level: just add blank lines
• Block: use list continuation (+)
But list continuation was used here at the top level, which
results in literal `+` in the output formats.
Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
---
Documentation/git-column.adoc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-column.adoc b/Documentation/git-column.adoc
index 5a4f2b6fde9..8e0047214dc 100644
--- a/Documentation/git-column.adoc
+++ b/Documentation/git-column.adoc
@@ -50,7 +50,7 @@ EXAMPLES
--------
Format data by columns:
-+
+
------------
$ seq 1 24 | git column --mode=column --padding=5
1 4 7 10 13 16 19 22
@@ -59,7 +59,7 @@ $ seq 1 24 | git column --mode=column --padding=5
------------
Format data by rows:
-+
+
------------
$ seq 1 21 | git column --mode=row --padding=5
1 2 3 4 5 6 7
@@ -68,7 +68,7 @@ $ seq 1 21 | git column --mode=row --padding=5
------------
List some tags in a table with unequal column widths:
-+
+
------------
$ git tag --list 'v2.4.*' --column=row,dense
v2.4.0 v2.4.0-rc0 v2.4.0-rc1 v2.4.0-rc2 v2.4.0-rc3
base-commit: 7014b55638da979331baf8dc31c4e1d697cf2d67
--
2.50.0.rc0.46.g7014b55638d
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] doc: column: fix blank lines before block delimiters
2025-05-31 21:08 [PATCH] doc: column: fix blank lines before block delimiters kristofferhaugsbakk
@ 2025-05-31 21:46 ` Jean-Noël AVILA
2025-05-31 22:49 ` Kristoffer Haugsbakk
2025-06-01 11:36 ` [PATCH v2] doc: column: fix blank lines around " kristofferhaugsbakk
2 siblings, 0 replies; 4+ messages in thread
From: Jean-Noël AVILA @ 2025-05-31 21:46 UTC (permalink / raw)
To: git, kristofferhaugsbakk; +Cc: Kristoffer Haugsbakk
On Saturday, 31 May 2025 23:08:09 CEST kristofferhaugsbakk@fastmail.com wrote:
> From: Kristoffer Haugsbakk <code@khaugsbakk.name>
>
> 227c4f33a03 (doc: add a blank line around block delimiters,
> 2025-03-09) added blank lines around block delimiters as a
> defensive measure. For each block you had to mind the con-
> text (like the commit says):
>
> • Top-level: just add blank lines
> • Block: use list continuation (+)
>
> But list continuation was used here at the top level, which
> results in literal `+` in the output formats.
>
> Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
> ---
> Documentation/git-column.adoc | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/git-column.adoc b/Documentation/git-column.adoc
> index 5a4f2b6fde9..8e0047214dc 100644
> --- a/Documentation/git-column.adoc
> +++ b/Documentation/git-column.adoc
> @@ -50,7 +50,7 @@ EXAMPLES
> --------
>
> Format data by columns:
> -+
> +
> ------------
> $ seq 1 24 | git column --mode=column --padding=5
> 1 4 7 10 13 16 19 22
> @@ -59,7 +59,7 @@ $ seq 1 24 | git column --mode=column --padding=5
> ------------
>
> Format data by rows:
> -+
> +
> ------------
> $ seq 1 21 | git column --mode=row --padding=5
> 1 2 3 4 5 6 7
> @@ -68,7 +68,7 @@ $ seq 1 21 | git column --mode=row --padding=5
> ------------
>
> List some tags in a table with unequal column widths:
> -+
> +
> ------------
> $ git tag --list 'v2.4.*' --column=row,dense
> v2.4.0 v2.4.0-rc0 v2.4.0-rc1 v2.4.0-rc2 v2.4.0-rc3
>
> base-commit: 7014b55638da979331baf8dc31c4e1d697cf2d67
Acked-by: Jean-Noël Avila <jn.avila@free.fr>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] doc: column: fix blank lines before block delimiters
2025-05-31 21:08 [PATCH] doc: column: fix blank lines before block delimiters kristofferhaugsbakk
2025-05-31 21:46 ` Jean-Noël AVILA
@ 2025-05-31 22:49 ` Kristoffer Haugsbakk
2025-06-01 11:36 ` [PATCH v2] doc: column: fix blank lines around " kristofferhaugsbakk
2 siblings, 0 replies; 4+ messages in thread
From: Kristoffer Haugsbakk @ 2025-05-31 22:49 UTC (permalink / raw)
To: Kristoffer Haugsbakk, git; +Cc: Jean-Noël AVILA
> doc: column: fix blank lines before block delimiters
“before” is technically correct since these changes happen to only be before
the blocks. But maybe it should be “around” in order to be stay consistent
with the commit message. I’ll go for that.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2] doc: column: fix blank lines around block delimiters
2025-05-31 21:08 [PATCH] doc: column: fix blank lines before block delimiters kristofferhaugsbakk
2025-05-31 21:46 ` Jean-Noël AVILA
2025-05-31 22:49 ` Kristoffer Haugsbakk
@ 2025-06-01 11:36 ` kristofferhaugsbakk
2 siblings, 0 replies; 4+ messages in thread
From: kristofferhaugsbakk @ 2025-06-01 11:36 UTC (permalink / raw)
To: gitster; +Cc: Kristoffer Haugsbakk, git, Jean-Noël Avila
From: Kristoffer Haugsbakk <code@khaugsbakk.name>
227c4f33a03 (doc: add a blank line around block delimiters,
2025-03-09) added blank lines around block delimiters as a
defensive measure. For each block you had to mind the con-
text (like the commit says):
• Top-level: just add blank lines
• Block: use list continuation (+)
But list continuation was used here at the top level, which
results in literal `+` in the output formats.
Acked-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
---
Notes (series):
v2:
• Finally trying the “After the list reached a consensus” step of
SubmittingPatches
• Add Ack
• Use “around” consistently in subject and message
Documentation/git-column.adoc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-column.adoc b/Documentation/git-column.adoc
index 5a4f2b6fde9..8e0047214dc 100644
--- a/Documentation/git-column.adoc
+++ b/Documentation/git-column.adoc
@@ -50,7 +50,7 @@ EXAMPLES
--------
Format data by columns:
-+
+
------------
$ seq 1 24 | git column --mode=column --padding=5
1 4 7 10 13 16 19 22
@@ -59,7 +59,7 @@ $ seq 1 24 | git column --mode=column --padding=5
------------
Format data by rows:
-+
+
------------
$ seq 1 21 | git column --mode=row --padding=5
1 2 3 4 5 6 7
@@ -68,7 +68,7 @@ $ seq 1 21 | git column --mode=row --padding=5
------------
List some tags in a table with unequal column widths:
-+
+
------------
$ git tag --list 'v2.4.*' --column=row,dense
v2.4.0 v2.4.0-rc0 v2.4.0-rc1 v2.4.0-rc2 v2.4.0-rc3
Range-diff against v1:
1: b493b07f88b ! 1: 3c6d7b15404 doc: column: fix blank lines before block delimiters
@@ Metadata
Author: Kristoffer Haugsbakk <code@khaugsbakk.name>
## Commit message ##
- doc: column: fix blank lines before block delimiters
+ doc: column: fix blank lines around block delimiters
227c4f33a03 (doc: add a blank line around block delimiters,
2025-03-09) added blank lines around block delimiters as a
@@ Commit message
But list continuation was used here at the top level, which
results in literal `+` in the output formats.
+ Acked-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
## Documentation/git-column.adoc ##
base-commit: 7014b55638da979331baf8dc31c4e1d697cf2d67
--
2.50.0.rc0.47.g3c6d7b15404.dirty
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-06-01 11:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-31 21:08 [PATCH] doc: column: fix blank lines before block delimiters kristofferhaugsbakk
2025-05-31 21:46 ` Jean-Noël AVILA
2025-05-31 22:49 ` Kristoffer Haugsbakk
2025-06-01 11:36 ` [PATCH v2] doc: column: fix blank lines around " kristofferhaugsbakk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).