diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-09-14 12:56:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-09-14 12:56:40 -0700 |
| commit | 7a54d740451c1438b4db009bf2ebe1669c280ef8 (patch) | |
| tree | f7e62497ee2ee95308c682377282dce0ab60a0b3 /Documentation/git-merge.txt | |
| parent | dd407f1c7c7cce148d7313537494d0bc049ccb0e (diff) | |
| parent | 9274dea3d95365c1ed0cd5ef46a9b677ae5c478f (diff) | |
| download | git-7a54d740451c1438b4db009bf2ebe1669c280ef8.tar.gz | |
Merge branch 'ab/dedup-config-and-command-docs'
Share the text used to explain configuration variables used by "git
<subcmd>" in "git help <subcmd>" with the text from "git help config".
* ab/dedup-config-and-command-docs:
docs: add CONFIGURATION sections that fuzzy map to built-ins
docs: add CONFIGURATION sections that map to a built-in
log docs: de-duplicate configuration sections
difftool docs: de-duplicate configuration sections
notes docs: de-duplicate and combine configuration sections
apply docs: de-duplicate configuration sections
send-email docs: de-duplicate configuration sections
grep docs: de-duplicate configuration sections
docs: add and use include template for config/* includes
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index fee1dc2df2..2d6a1391c8 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/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], |