mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
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>
This commit is contained in:
parent
ab14f494cf
commit
5a06936b60
|
@ -51,7 +51,7 @@ OPTIONS
|
||||||
|
|
||||||
CONFIGURATION
|
CONFIGURATION
|
||||||
-------------
|
-------------
|
||||||
include::fmt-merge-msg-config.txt[]
|
include::config/fmt-merge-msg.txt[]
|
||||||
|
|
||||||
merge.summary::
|
merge.summary::
|
||||||
Synonym to `merge.log`; this is deprecated and will be removed in
|
Synonym to `merge.log`; this is deprecated and will be removed in
|
||||||
|
|
|
@ -30,7 +30,7 @@ merge.verifySignatures::
|
||||||
If true, this is equivalent to the --verify-signatures command
|
If true, this is equivalent to the --verify-signatures command
|
||||||
line option. See linkgit:git-merge[1] for details.
|
line option. See linkgit:git-merge[1] for details.
|
||||||
|
|
||||||
include::fmt-merge-msg-config.txt[]
|
include::config/fmt-merge-msg.txt[]
|
||||||
|
|
||||||
merge.renameLimit::
|
merge.renameLimit::
|
||||||
The number of files to consider when performing rename detection
|
The number of files to consider when performing rename detection
|
||||||
|
|
Loading…
Reference in a new issue