summaryrefslogtreecommitdiff
path: root/Documentation/fmt-merge-msg-config.txt
blob: c73cfa90b70c59c14cd4984c950711bef5b3f6bf (plain)
1
2
3
4
5
6
7
8
9
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.