From: Junio C Hamano <gitster@pobox•com>
To: "Jakub Ječmínek" <kuba@kubajecminek•cz>
Cc: git@vger•kernel.org
Subject: Re: [PATCH] doc: improve formatting in branch section
Date: Mon, 30 Jun 2025 11:17:44 -0700 [thread overview]
Message-ID: <xmqqldp914c7.fsf@gitster.g> (raw)
In-Reply-To: <20250629190445.10185-1-kuba@kubajecminek.cz> ("Jakub Ječmínek"'s message of "Sun, 29 Jun 2025 21:04:45 +0200")
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.
prev parent reply other threads:[~2025-06-30 18:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-29 19:04 [PATCH] doc: improve formatting in branch section Jakub Ječmínek
2025-06-30 18:17 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqldp914c7.fsf@gitster.g \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=kuba@kubajecminek$(echo .)cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox