6e6029a82a
In Git 2.28, we stopped special casing 'master' when producing the default merge message by just removing the code to squelch "into 'master'" at the end of the message. Introduce multi-valued merge.suppressDest configuration variable that gives a set of globs to match against the name of the branch into which the merge is being made, to let users specify for which branch fmt-merge-msg's output should be shortened. When it is not set, 'master' is used as the sole value of the variable by default. The above move mostly reverts the pre-2.28 default in repositories that have no relevant configuration. Add a few tests to protect the behaviour with the new configuration variable from future regression. Helped-by: Linus Torvalds <torvalds@linux-foundation.org> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
23 lines
883 B
Plaintext
23 lines
883 B
Plaintext
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.
|