From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Sep 2025 05:39:17 GMT
Subject: Re: [PATCH v2 2/4] doc: add an UPSTREAM BRANCHES section to pull/push/fetch
Message-ID: <xmqqms6varcq.fsf@gitster.g>
In-Reply-To: <xmqqqzw7arls.fsf@gitster.g>

Junio C Hamano <gitster@pobox.com> writes:

> For now I'd locally patch it with the attached, which does not seem
> to change the output at all when formatted with Asciidoctor, and
> does not break the build when AsciiDoctor is used.

Sorry for the subtle typo on the last line.  i.e. "AsciiDoctor" ->
"AsciiDoc".

What I meant was that Asciidoctor has no issues with your
version (while AsciiDoc complains), and with the attached patch,
Asciidoctor produces identical output as your original, and AsciiDoc
no longer complains.

> Thanks.
>
> diff --git a/Documentation/urls-remotes-upstreams.adoc b/Documentation/urls-remotes-upstreams.adoc
> index 1e9c56dc5f..f40db15b20 100644
> --- a/Documentation/urls-remotes-upstreams.adoc
> +++ b/Documentation/urls-remotes-upstreams.adoc
> @@ -107,11 +107,9 @@ Git defaults to using the upstream branch for remote operations, for example:
>  The upstream is stored in `.git/config`, in the "remote" and "merge"
>  fields. For example, if `main`'s upstream is `origin/main`:
>  
> -```
> -[branch "main"]
> -   remote = origin
> -   merge = refs/heads/main
> -```
> +	[branch "main"]
> +	   remote = origin
> +	   merge = refs/heads/main
>  
>  You can set an upstream branch explicitly with
>  `git push --set-upstream <remote> <branch>` or `git branch --track`,