# [PATCH] doc: improve formatting in branch section 2 messages from 2025-06-29 to 2025-06-30. Participants: Jakub Ječmínek, Junio C Hamano. Thread: https://gitlist.dev/t/63709 ## Jakub Ječmínek, 2025-06-29 19:04 Subject: [PATCH] doc: improve formatting in branch section Message-ID: <20250629190445.10185-1-kuba@kubajecminek.cz> URL: https://gitlist.dev/e/20250629190445.10185-1-kuba%40kubajecminek.cz ``` The 'branch' section of the git-config documentation was missing inline code formatting and emphasis for the placeholder. Both changes improve readability, especially when viewed online. Signed-off-by: Jakub Ječmínek --- 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 from + If you wish to setup `git pull` so that it merges into __ from another branch in the local repository, you can point - branch..merge to the desired branch, and use the relative path + `branch..merge` to the desired branch, and use the relative path setting `.` (a period) for `branch..remote`. `branch..mergeOptions`:: -- 2.49.0 ``` ## Junio C Hamano, 2025-06-30 18:17 Subject: Re: [PATCH] doc: improve formatting in branch section Message-ID: URL: https://gitlist.dev/e/xmqqldp914c7.fsf%40gitster.g In-Reply-To: <20250629190445.10185-1-kuba@kubajecminek.cz> ``` Jakub Ječmínek writes: > The 'branch' section of the git-config documentation was missing > inline code formatting and emphasis for the placeholder. > > Both changes improve readability, especially when viewed online. > > Signed-off-by: Jakub Ječmínek > --- > 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 from > + If you wish to setup `git pull` so that it merges into __ from > another branch in the local repository, you can point > - branch..merge to the desired branch, and use the relative path > + `branch..merge` to the desired branch, and use the relative path > setting `.` (a period) for `branch..remote`. > > `branch..mergeOptions`:: Looks good to me. Thanks. ```