mirror of
https://github.com/git/git.git
synced 2024-05-18 20:36:15 +02:00
10a758479e
We document how `merge.suppressDest` can be used to omit " into <branch name>" from the title of the merge message. It is true that we omit the space character before "into", but that lone double quote character risks ending up on the wrong side of a line break, looking a bit out of place. This currently happens with, e.g., 80-character terminals. Drop that leading quoted space. The result should be just as clear about how this option affects the formatted message. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
23 lines
882 B
Plaintext
23 lines
882 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.
|