diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-10-27 08:22:57 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-10-29 10:17:01 +0900 |
| commit | 5a06936b6050c9cb13dcf2577efb5984fd47394e (patch) | |
| tree | a51122824b3b147d114d5dcfca1228ba11b69a24 /Documentation/merge-config.txt | |
| parent | config.txt: move format-config.txt to config/ (diff) | |
| download | tgif-5a06936b6050c9cb13dcf2577efb5984fd47394e.tar.xz | |
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/merge-config.txt')
| -rw-r--r-- | Documentation/merge-config.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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 |