From: Nguyễn Thái Ngọc Duy Date: Sat, 27 Oct 2018 06:22:57 +0000 (+0200) Subject: config.txt: move fmt-merge-msg-config.txt to config/ X-Git-Tag: v2.20.0-rc0~59^2~54 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5a06936b6050c9cb13dcf2577efb5984fd47394e;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- 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 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 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. -include::fmt-merge-msg-config.txt[] +include::config/fmt-merge-msg.txt[] merge.renameLimit:: The number of files to consider when performing rename detection