Merge branch 'ea/blame-use-oideq'

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

diff --git a/Documentation/config/fmt-merge-msg.txt b/Documentation/config/fmt-merge-msg.txt
index c73cfa90b70c59c14cd4984c950711bef5b3f6bf..a8e8f74d0a25e6b857358cc78864c288d8fc4cfa 100644 (file)
--- a/Documentation/config/fmt-merge-msg.txt
+++ b/Documentation/config/fmt-merge-msg.txt
@@ -8,3 +8,15 @@ merge.log::
        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.