diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-09-14 13:25:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-09-14 13:25:23 -0700 |
| commit | ba8baee8618696a4405a1c7feb93ce8d3b089795 (patch) | |
| tree | 36a0a7f824df6259cd09b0081e297b366279ab46 /git-merge.txt | |
| parent | b2e63923b4a1650cdd5c8d919dacf6c650940a92 (diff) | |
| download | git-htmldocs-ba8baee8618696a4405a1c7feb93ce8d3b089795.tar.gz | |
Autogenerated HTML docs for v2.37.3-662-g36f8e7e
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git-merge.txt b/git-merge.txt index fee1dc2df..2d6a1391c 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -383,13 +383,16 @@ include::merge-strategies.txt[] CONFIGURATION ------------- -include::config/merge.txt[] branch.<name>.mergeOptions:: Sets default options for merging into branch <name>. The syntax and supported options are the same as those of 'git merge', but option values containing whitespace characters are currently not supported. +include::includes/cmd-config-section-rest.txt[] + +include::config/merge.txt[] + SEE ALSO -------- linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], |