blob: c73cfa90b70c59c14cd4984c950711bef5b3f6bf [file] [log] [blame]
Junio C Hamanoce447ab2015-06-16 22:08:011merge.branchdesc::
2In addition to branch names, populate the log message with
3the branch description text associated with them. Defaults
4to false.
5
6merge.log::
7In addition to branch names, populate the log message with at
8most the specified number of one-line descriptions from the
9actual commits that are being merged. Defaults to false, and
10true is a synonym for 20.