From: Jakub Ječmínek Date: Sun, 29 Jun 2025 19:04:45 +0000 (+0200) Subject: doc: improve formatting in branch section X-Git-Tag: v2.51.0-rc0~91^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=996f14c02b2647d5846debd8dd8537bbbe47ab89;p=thirdparty%2Fgit.git doc: improve formatting in branch section 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 Signed-off-by: Junio C Hamano --- 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`::