admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jj/doc-branch-markup-fix'

Browse Source 
Doc markup fix.

* jj/doc-branch-markup-fix:
  doc: improve formatting in branch section
This commit is contained in:
Junio C Hamano
2025-07-07 14:12:57 -07:00
parent 844911960c 996f14c02b
commit 0dc5b7627e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/config/branch.adoc
View File

@@ -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`::