summaryrefslogtreecommitdiff
path: root/Documentation/git-fmt-merge-msg.txt
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-10-27 06:22:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-10-29 01:17:01 (GMT)
commit5a06936b6050c9cb13dcf2577efb5984fd47394e (patch)
treea51122824b3b147d114d5dcfca1228ba11b69a24 /Documentation/git-fmt-merge-msg.txt
parentab14f494cfab7586bf2efa53180068619314e441 (diff)
downloadgit-5a06936b6050c9cb13dcf2577efb5984fd47394e.zip
git-5a06936b6050c9cb13dcf2577efb5984fd47394e.tar.gz
git-5a06936b6050c9cb13dcf2577efb5984fd47394e.tar.bz2
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>
Diffstat (limited to 'Documentation/git-fmt-merge-msg.txt')
-rw-r--r--Documentation/git-fmt-merge-msg.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
index 423b6e0..6793d8f 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