config.txt: move merge-config.txt to config/
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
f7ade6c980
commit
7fb5ab4a02
@ -371,7 +371,7 @@ include::config/mailmap.txt[]
|
||||
|
||||
include::config/man.txt[]
|
||||
|
||||
include::merge-config.txt[]
|
||||
include::config/merge.txt[]
|
||||
|
||||
mergetool.<tool>.path::
|
||||
Override the path for the given tool. This is useful in case
|
||||
|
@ -30,7 +30,7 @@ merge.verifySignatures::
|
||||
If true, this is equivalent to the --verify-signatures command
|
||||
line option. See linkgit:git-merge[1] for details.
|
||||
|
||||
include::config/fmt-merge-msg.txt[]
|
||||
include::fmt-merge-msg.txt[]
|
||||
|
||||
merge.renameLimit::
|
||||
The number of files to consider when performing rename detection
|
||||
@ -63,7 +63,7 @@ merge.tool::
|
||||
Any other value is treated as a custom merge tool and requires
|
||||
that a corresponding mergetool.<tool>.cmd variable is defined.
|
||||
|
||||
include::mergetools-merge.txt[]
|
||||
include::../mergetools-merge.txt[]
|
||||
|
||||
merge.verbosity::
|
||||
Controls the amount of output shown by the recursive merge
|
@ -342,7 +342,7 @@ include::merge-strategies.txt[]
|
||||
|
||||
CONFIGURATION
|
||||
-------------
|
||||
include::merge-config.txt[]
|
||||
include::config/merge.txt[]
|
||||
|
||||
branch.<name>.mergeOptions::
|
||||
Sets default options for merging into branch <name>. The syntax and
|
||||
|
Loading…
Reference in New Issue
Block a user