index f04a9ff0e0299bdb6f33d10f5674cc19dc2777f7..40dba8c0a9f308064f67d8f38ce8a22b2a42a77c 100644 (file)
-------------
merge.log::
- Whether to include summaries of merged commits in newly
- merge commit messages. False by default.
+ 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 synoym for 20.
merge.summary::
Synonym to `merge.log`; this is deprecated and will be removed in