diff options
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], |