config.txt: move fmt-merge-msg-config.txt to config/
Note that this file is not directly included in config.txt but through merge-config.txt and it's in "merge" section instead of a separate "fmtMergeMsg" section like others. 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:22 UTC
5a06936b6050c9cb13dcf2577efb5984fd47394e
3 files changed
+2
-2
Documentation/config/fmt-merge-msg.txt
renamed
Documentation/git-fmt-merge-msg.txt
+1
-1
@@ -51,7 +51,7 @@ OPTIONS
51
52
CONFIGURATION
53
-------------
54
-include::fmt-merge-msg-config.txt[]
54
+include::config/fmt-merge-msg.txt[]
55
56
merge.summary::
57
Synonym to `merge.log`; this is deprecated and will be removed in
Documentation/merge-config.txt
+1
-1
@@ -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::fmt-merge-msg-config.txt[]
33
+include::config/fmt-merge-msg.txt[]
34
35
merge.renameLimit::
36
The number of files to consider when performing rename detection