* [PATCH] doc: improve formatting in branch section
@ 2025-06-29 19:04 Jakub Ječmínek
2025-06-30 18:17 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Jakub Ječmínek @ 2025-06-29 19:04 UTC (permalink / raw)
To: git; +Cc: Jakub Ječmínek
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`::
--
2.49.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] doc: improve formatting in branch section
2025-06-29 19:04 [PATCH] doc: improve formatting in branch section Jakub Ječmínek
@ 2025-06-30 18:17 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2025-06-30 18:17 UTC (permalink / raw)
To: Jakub Ječmínek; +Cc: git
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-06-30 18:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox