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