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