about summary refs log tree commit diff
path: root/third_party/git/Documentation/config/fmt-merge-msg.txt
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/git/Documentation/config/fmt-merge-msg.txt')
-rw-r--r--third_party/git/Documentation/config/fmt-merge-msg.txt12
1 files changed, 12 insertions, 0 deletions
diff --git a/third_party/git/Documentation/config/fmt-merge-msg.txt b/third_party/git/Documentation/config/fmt-merge-msg.txt
index c73cfa90b70c..3fbf40e24f62 100644
--- a/third_party/git/Documentation/config/fmt-merge-msg.txt
+++ b/third_party/git/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.