git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] doc: improve formatting in branch section

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 30, 2025, 18:17 UTC
Message-ID
<xmqqldp914c7.fsf@gitster.g>
In-Reply-To
<20250629190445.10185-1-kuba@kubajecminek.cz>
Jakub Ječmínek <kuba@kubajecminek.cz> writes:
Show 26 quoted lines
> 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.
Previous: Jakub Ječmínek
Message 2 of 2 in “doc: improve formatting in branch section”
  1. doc: improve formatting in branch sectionJakub Ječmínek, Jun 29, 2025
  2. Junio C HamanoJun 30, 2025

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.