diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-10-27 06:22:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-29 01:17:01 (GMT) |
| commit | 5a06936b6050c9cb13dcf2577efb5984fd47394e (patch) | |
| tree | a51122824b3b147d114d5dcfca1228ba11b69a24 /Documentation | |
| parent | ab14f494cfab7586bf2efa53180068619314e441 (diff) | |
| download | git-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')
| -rw-r--r-- | Documentation/config/fmt-merge-msg.txt (renamed from Documentation/fmt-merge-msg-config.txt) | 0 | ||||
| -rw-r--r-- | Documentation/git-fmt-merge-msg.txt | 2 | ||||
| -rw-r--r-- | Documentation/merge-config.txt | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/fmt-merge-msg-config.txt b/Documentation/config/fmt-merge-msg.txt index c73cfa9..c73cfa9 100644 --- a/Documentation/fmt-merge-msg-config.txt +++ b/Documentation/config/fmt-merge-msg.txt 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 diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 662c271..0bb703f 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 |