From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Jun 2025 18:17:44 GMT
Subject: Re: [PATCH] doc: improve formatting in branch section
Message-ID: <xmqqldp914c7.fsf@gitster.g>
In-Reply-To: <20250629190445.10185-1-kuba@kubajecminek.cz>

Jakub Ječmínek <kuba@kubajecminek.cz> writes:

> The 'branch' section of the git-config documentation was missing
> inline code formatting and emphasis for the <name> placeholder.
>
> Both changes improve readability, especially when viewed online.
>
> Signed-off-by: Jakub Ječmínek <kuba@kubajecminek.cz>
> ---
>  Documentation/config/branch.adoc | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/config/branch.adoc b/Documentation/config/branch.adoc
> index e35ea7ac64..a4db9fa5c8 100644
> --- a/Documentation/config/branch.adoc
> +++ b/Documentation/config/branch.adoc
> @@ -69,9 +69,9 @@ This option defaults to `never`.
>  	`git fetch`) to lookup the default branch for merging. Without
>  	this option, `git pull` defaults to merge the first refspec fetched.
>  	Specify multiple values to get an octopus merge.
> -	If you wish to setup `git pull` so that it merges into <name> from
> +	If you wish to setup `git pull` so that it merges into _<name>_ from
>  	another branch in the local repository, you can point
> -	branch.<name>.merge to the desired branch, and use the relative path
> +	`branch.<name>.merge` to the desired branch, and use the relative path
>  	setting `.` (a period) for `branch.<name>.remote`.
>  
>  `branch.<name>.mergeOptions`::

Looks good to me.  Thanks.