diff options
| author | Jakub Ječmínek <kuba@kubajecminek.cz> | 2025-06-29 21:04:45 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-06-30 11:11:36 -0700 |
| commit | 996f14c02b2647d5846debd8dd8537bbbe47ab89 (patch) | |
| tree | 507ac3f5951cdd19f158776abf5e0a0379f14773 | |
| parent | Git 2.50 (diff) | |
| download | git-996f14c02b2647d5846debd8dd8537bbbe47ab89.tar.gz git-996f14c02b2647d5846debd8dd8537bbbe47ab89.zip | |
doc: improve formatting in branch section
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/config/branch.adoc | 4 |
1 files 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`:: |