* [PATCH 0/2] doc: fix subheading and inline-verbatim
@ 2025-05-03 19:13 kristofferhaugsbakk
2025-05-03 19:13 ` [PATCH 1/2] doc: reflog: fix `drop` subheading kristofferhaugsbakk
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: kristofferhaugsbakk @ 2025-05-03 19:13 UTC (permalink / raw)
To: git; +Cc: Kristoffer Haugsbakk, Jean-Noël Avila, Karthik Nayak
From: Kristoffer Haugsbakk <code@khaugsbakk.name>
I found patch 1 by accident. Then I looked over
`Documentation/doc-diff` and made patch 2, after
finding out about it.[1]
🔗 1: https://lore.kernel.org/git/CAPig+cQoFC_2M-S0d7SLBPFvusXQC93pbk3QP2+qhsa7BJGnuQ@mail.gmail.com/
Kristoffer Haugsbakk (2):
doc: reflog: fix `drop` subheading
doc: branch: fix inline-verbatim
Documentation/git-branch.adoc | 2 +-
Documentation/git-reflog.adoc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
base-commit: 6c0bd1fc70efaf053abe4e57c976afdc72d15377
--
2.49.0.459.gf65182a99e5
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 1/2] doc: reflog: fix `drop` subheading
2025-05-03 19:13 [PATCH 0/2] doc: fix subheading and inline-verbatim kristofferhaugsbakk
@ 2025-05-03 19:13 ` kristofferhaugsbakk
2025-05-03 19:13 ` [PATCH 2/2] doc: branch: fix inline-verbatim kristofferhaugsbakk
2025-05-05 17:47 ` [PATCH 0/2] doc: fix subheading and inline-verbatim Junio C Hamano
2 siblings, 0 replies; 5+ messages in thread
From: kristofferhaugsbakk @ 2025-05-03 19:13 UTC (permalink / raw)
To: git; +Cc: Kristoffer Haugsbakk, Jean-Noël Avila, Karthik Nayak
From: Kristoffer Haugsbakk <code@khaugsbakk.name>
The tilde (~) count doesn’t match the length of the heading. In turn
you get a bunch of `<sub>~</sub>` instead of the intended `<h3>` in the
HTML output.
Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
---
Documentation/git-reflog.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-reflog.adoc b/Documentation/git-reflog.adoc
index b55c0605697..412f06b8fec 100644
--- a/Documentation/git-reflog.adoc
+++ b/Documentation/git-reflog.adoc
@@ -138,7 +138,7 @@ Options for `delete`
used with `expire`.
Options for `drop`
-~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~
--all::
Drop the reflogs of all references from all worktrees.
--
2.49.0.459.gf65182a99e5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] doc: branch: fix inline-verbatim
2025-05-03 19:13 [PATCH 0/2] doc: fix subheading and inline-verbatim kristofferhaugsbakk
2025-05-03 19:13 ` [PATCH 1/2] doc: reflog: fix `drop` subheading kristofferhaugsbakk
@ 2025-05-03 19:13 ` kristofferhaugsbakk
2025-05-06 13:01 ` Jean-Noël Avila
2025-05-05 17:47 ` [PATCH 0/2] doc: fix subheading and inline-verbatim Junio C Hamano
2 siblings, 1 reply; 5+ messages in thread
From: kristofferhaugsbakk @ 2025-05-03 19:13 UTC (permalink / raw)
To: git; +Cc: Kristoffer Haugsbakk, Jean-Noël Avila, Karthik Nayak
From: Kristoffer Haugsbakk <code@khaugsbakk.name>
7b399322a2e (doc: apply new format to git-branch man page, 2025-03-19)
updated the formatting for this doc to, among other things, use backtick
for some elements. In the process `è` was used by accident instead
of backtick.
Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
---
Documentation/git-branch.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-branch.adoc b/Documentation/git-branch.adoc
index 50a1e13e1f2..c0afddc424d 100644
--- a/Documentation/git-branch.adoc
+++ b/Documentation/git-branch.adoc
@@ -373,7 +373,7 @@ $ git branch -D test <2>
------------
+
<1> Delete the remote-tracking branches "todo", "html" and "man". The next
- `git fetch` or `git pullè will create them again unless you configure them not to.
+ `git fetch` or `git pull` will create them again unless you configure them not to.
See linkgit:git-fetch[1].
<2> Delete the "test" branch even if the "master" branch (or whichever branch
is currently checked out) does not have all commits from the test branch.
--
2.49.0.459.gf65182a99e5
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 2/2] doc: branch: fix inline-verbatim
2025-05-03 19:13 ` [PATCH 2/2] doc: branch: fix inline-verbatim kristofferhaugsbakk
@ 2025-05-06 13:01 ` Jean-Noël Avila
0 siblings, 0 replies; 5+ messages in thread
From: Jean-Noël Avila @ 2025-05-06 13:01 UTC (permalink / raw)
To: kristofferhaugsbakk, git; +Cc: Kristoffer Haugsbakk, Karthik Nayak
Le 03/05/2025 à 21:13, kristofferhaugsbakk@fastmail.com a écrit :
> From: Kristoffer Haugsbakk <code@khaugsbakk.name>
>
> 7b399322a2e (doc: apply new format to git-branch man page, 2025-03-19)
> updated the formatting for this doc to, among other things, use backtick
> for some elements. In the process `è` was used by accident instead
> of backtick.
>
> Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
> ---
> Documentation/git-branch.adoc | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/git-branch.adoc b/Documentation/git-branch.adoc
> index 50a1e13e1f2..c0afddc424d 100644
> --- a/Documentation/git-branch.adoc
> +++ b/Documentation/git-branch.adoc
> @@ -373,7 +373,7 @@ $ git branch -D test <2>
> ------------
> +
> <1> Delete the remote-tracking branches "todo", "html" and "man". The next
> - `git fetch` or `git pullè will create them again unless you configure them not to.
> + `git fetch` or `git pull` will create them again unless you configure them not to.
> See linkgit:git-fetch[1].
> <2> Delete the "test" branch even if the "master" branch (or whichever branch
> is currently checked out) does not have all commits from the test branch.
Thank you for spotting this one!
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 0/2] doc: fix subheading and inline-verbatim
2025-05-03 19:13 [PATCH 0/2] doc: fix subheading and inline-verbatim kristofferhaugsbakk
2025-05-03 19:13 ` [PATCH 1/2] doc: reflog: fix `drop` subheading kristofferhaugsbakk
2025-05-03 19:13 ` [PATCH 2/2] doc: branch: fix inline-verbatim kristofferhaugsbakk
@ 2025-05-05 17:47 ` Junio C Hamano
2 siblings, 0 replies; 5+ messages in thread
From: Junio C Hamano @ 2025-05-05 17:47 UTC (permalink / raw)
To: kristofferhaugsbakk
Cc: git, Kristoffer Haugsbakk, Jean-Noël Avila, Karthik Nayak
kristofferhaugsbakk@fastmail.com writes:
> From: Kristoffer Haugsbakk <code@khaugsbakk.name>
>
> I found patch 1 by accident. Then I looked over
> `Documentation/doc-diff` and made patch 2, after
> finding out about it.[1]
>
> 🔗 1:
Both fixes look reasonable.
Thanks, will queue.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-05-06 13:11 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-03 19:13 [PATCH 0/2] doc: fix subheading and inline-verbatim kristofferhaugsbakk
2025-05-03 19:13 ` [PATCH 1/2] doc: reflog: fix `drop` subheading kristofferhaugsbakk
2025-05-03 19:13 ` [PATCH 2/2] doc: branch: fix inline-verbatim kristofferhaugsbakk
2025-05-06 13:01 ` Jean-Noël Avila
2025-05-05 17:47 ` [PATCH 0/2] doc: fix subheading and inline-verbatim 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;
as well as URLs for NNTP newsgroup(s).