diff mbox series

[24/78] config.txt: move fmt-merge-msg-config.txt to config/

Message ID 20181027062351.30446-25-pclouds@gmail.com (mailing list archive)
State New, archived
Headers show
Series nd/config-split reroll | expand

Commit Message

Duy Nguyen Oct. 27, 2018, 6:22 a.m. UTC
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>
 .../{fmt-merge-msg-config.txt => config/fmt-merge-msg.txt}      | 0
 Documentation/git-fmt-merge-msg.txt                             | 2 +-
 Documentation/merge-config.txt                                  | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename Documentation/{fmt-merge-msg-config.txt => config/fmt-merge-msg.txt} (100%)
diff mbox series


diff --git a/Documentation/fmt-merge-msg-config.txt b/Documentation/config/fmt-merge-msg.txt
similarity index 100%
rename from Documentation/fmt-merge-msg-config.txt
rename to Documentation/config/fmt-merge-msg.txt
diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
index 423b6e033b..6793d8fc05 100644
--- a/Documentation/git-fmt-merge-msg.txt
+++ b/Documentation/git-fmt-merge-msg.txt
@@ -51,7 +51,7 @@  OPTIONS
 	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 662c2713ca..0bb703fbac 100644
--- 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.
 	The number of files to consider when performing rename detection