diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-07-07 14:12:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-07-07 14:12:57 -0700 |
| commit | 0dc5b7627e337d6f7a4515f41f8e7ad525b658ab (patch) | |
| tree | a0e0ada2325d373cb950cebf4f128196c6b36a1f /Documentation | |
| parent | 844911960ca081ff827a688dbfdf95fdc191881d (diff) | |
| parent | 996f14c02b2647d5846debd8dd8537bbbe47ab89 (diff) | |
| download | git-0dc5b7627e337d6f7a4515f41f8e7ad525b658ab.tar.xz | |
Merge branch 'jj/doc-branch-markup-fix'
Doc markup fix.
* jj/doc-branch-markup-fix:
doc: improve formatting in branch section
Diffstat (limited to 'Documentation')
| -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`:: |