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/fmt-merge-msg-config.txt | |
| 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/fmt-merge-msg-config.txt')
| -rw-r--r-- | Documentation/fmt-merge-msg-config.txt | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/Documentation/fmt-merge-msg-config.txt b/Documentation/fmt-merge-msg-config.txt deleted file mode 100644 index c73cfa9..0000000 --- a/Documentation/fmt-merge-msg-config.txt +++ /dev/null @@ -1,10 +0,0 @@ -merge.branchdesc:: - In addition to branch names, populate the log message with - the branch description text associated with them. Defaults - to false. - -merge.log:: - In addition to branch names, populate the log message with at - most the specified number of one-line descriptions from the - actual commits that are being merged. Defaults to false, and - true is a synonym for 20. |