diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-06-16 14:27:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-16 14:27:05 -0700 |
| commit | c7ca4424ea5644c6aa2c660a4a0726a75f8f2b84 (patch) | |
| tree | 4acab92baf40a8369e78a396ef343c75522345cd /Documentation/fmt-merge-msg-config.txt | |
| parent | Merge branch 'ah/send-email-sendmail-alias' (diff) | |
| parent | Documentation: include 'merge.branchdesc' for merge and config as well (diff) | |
| download | tgif-c7ca4424ea5644c6aa2c660a4a0726a75f8f2b84.tar.xz | |
Merge branch 'sg/merge-summary-config'
Doc updates.
* sg/merge-summary-config:
Documentation: include 'merge.branchdesc' for merge and config as well
Diffstat (limited to 'Documentation/fmt-merge-msg-config.txt')
| -rw-r--r-- | Documentation/fmt-merge-msg-config.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/fmt-merge-msg-config.txt b/Documentation/fmt-merge-msg-config.txt new file mode 100644 index 0000000000..c73cfa90b7 --- /dev/null +++ b/Documentation/fmt-merge-msg-config.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. |