[thirdparty/git.git] / Documentation / config / fmt-merge-msg.txt

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.

merge.suppressDest::
	By adding a glob that matches the names of integration
	branches to this multi-valued configuration variable, the
	default merge message computed for merges into these
	integration branches will omit " into <branch name>" from
	its title.
+
An element with an empty value can be used to clear the list
of globs accumulated from previous configuration entries.
When there is no `merge.suppressDest` variable defined, the
default value of `master` is used for backward compatibility.
Commit	Line	Data
fc0aa395 SG	1	merge.branchdesc::
	2	In addition to branch names, populate the log message with
	3	the branch description text associated with them. Defaults
	4	to false.
	5
	6	merge.log::
	7	In addition to branch names, populate the log message with at
	8	most the specified number of one-line descriptions from the
	9	actual commits that are being merged. Defaults to false, and
	10	true is a synonym for 20.
6e6029a8 JH	11
	12	merge.suppressDest::
	13	By adding a glob that matches the names of integration
	14	branches to this multi-valued configuration variable, the
	15	default merge message computed for merges into these
	16	integration branches will omit " into <branch name>" from
	17	its title.
	18	+
	19	An element with an empty value can be used to clear the list
	20	of globs accumulated from previous configuration entries.
	21	When there is no `merge.suppressDest` variable defined, the
	22	default value of `master` is used for backward compatibility.