development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-16 10:38:05 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

config.txt: move fmt-merge-msg-config.txt to config/

Browse source 
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>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2018-10-27 08:22:57 +02:00 committed by Junio C Hamano
parent ab14f494cf
commit 5a06936b60
3 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
Documentation/fmt-merge-msg-config.txt → Documentation/config/fmt-merge-msg.txt
View file

2
Documentation/git-fmt-merge-msg.txt
View file

@ -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

2
Documentation/merge-config.txt
View file

@ -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