diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-10-27 09:22:57 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-29 04:17:01 +0300 |
| commit | 5a06936b6050c9cb13dcf2577efb5984fd47394e (patch) | |
| tree | a51122824b3b147d114d5dcfca1228ba11b69a24 /Documentation/config/fmt-merge-msg.txt | |
| parent | ab14f494cfab7586bf2efa53180068619314e441 (diff) | |
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/config/fmt-merge-msg.txt')
| -rw-r--r-- | Documentation/config/fmt-merge-msg.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/config/fmt-merge-msg.txt b/Documentation/config/fmt-merge-msg.txt new file mode 100644 index 0000000000..c73cfa90b7 --- /dev/null +++ b/Documentation/config/fmt-merge-msg.txt @@ -0,0 +1,10 @@ +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. |