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>

diff --git a/Documentation/config/fmt-merge-msg.txt b/Documentation/config/fmt-merge-msg.txt
new file mode 100644 (file)
index 0000000..c73cfa9
--- /dev/null
+++ b/Documentation/config/fmt-merge-msg.txt
@@ -0,0 +1,10 @@
+merge.branchdesc::
+       In addition to branch names, populate the log message with
+       the branch description text associated with them.  Defaults
+       to false.
+
+merge.log::
+       In addition to branch names, populate the log message with at
+       most the specified number of one-line descriptions from the
+       actual commits that are being merged.  Defaults to false, and
+       true is a synonym for 20.

diff --git a/Documentation/fmt-merge-msg-config.txt b/Documentation/fmt-merge-msg-config.txt
deleted file mode 100644 (file)
index c73cfa9..0000000
--- a/Documentation/fmt-merge-msg-config.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-merge.branchdesc::
-       In addition to branch names, populate the log message with
-       the branch description text associated with them.  Defaults
-       to false.
-
-merge.log::
-       In addition to branch names, populate the log message with at
-       most the specified number of one-line descriptions from the
-       actual commits that are being merged.  Defaults to false, and
-       true is a synonym for 20.

diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
index 423b6e033ba512f8a8ed6fe3f0ee6ef158dd5234..6793d8fc05218f61ebc399b9ac910f27832bc58b 100644 (file)
--- a/Documentation/git-fmt-merge-msg.txt
+++ b/Documentation/git-fmt-merge-msg.txt
@@ -51,7 +51,7 @@ OPTIONS
 
 CONFIGURATION
 -------------
-include::fmt-merge-msg-config.txt[]
+include::config/fmt-merge-msg.txt[]
 
 merge.summary::
        Synonym to `merge.log`; this is deprecated and will be removed in

diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 662c2713cab4b9762dded702897d9e92ee0a0549..0bb703fbac2b0304cb08fbf5957b34f97000ec52 100644 (file)
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -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::fmt-merge-msg-config.txt[]
+include::config/fmt-merge-msg.txt[]
 
 merge.renameLimit::
        The number of files to consider when performing rename detection