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>
Nguyễn Thái Ngọc Duy committed
Oct 27, 2018 at 08:23 UTC
7fb5ab4a020185c74007ca04ca6f8de9a3ae3868
3 files changed
+4
-4
Documentation/config.txt
+1
-1
@@ -371,7 +371,7 @@ include::config/mailmap.txt[]
371
372
include::config/man.txt[]
373
374
-include::merge-config.txt[]
374
+include::config/merge.txt[]
375
376
mergetool.<tool>.path::
377
Override the path for the given tool. This is useful in case
Documentation/config/merge.txt
renamed
+2
-2
@@ -30,7 +30,7 @@ merge.verifySignatures::
30
If true, this is equivalent to the --verify-signatures command
31
line option. See linkgit:git-merge[1] for details.
32
33
-include::config/fmt-merge-msg.txt[]
33
+include::fmt-merge-msg.txt[]
34
35
merge.renameLimit::
36
The number of files to consider when performing rename detection
@@ -63,7 +63,7 @@ merge.tool::
63
Any other value is treated as a custom merge tool and requires
64
that a corresponding mergetool.<tool>.cmd variable is defined.
65
66
-include::mergetools-merge.txt[]
66
+include::../mergetools-merge.txt[]
67
68
merge.verbosity::
69
Controls the amount of output shown by the recursive merge
Documentation/git-merge.txt
+1
-1
@@ -342,7 +342,7 @@ include::merge-strategies.txt[]
342
343
CONFIGURATION
344
-------------
345
-include::merge-config.txt[]
345
+include::config/merge.txt[]
346
347
branch.<name>.mergeOptions::
348
Sets default options for merging into branch <name>. The syntax and