Merge branch 'sg/merge-summary-config' into maint

[git-core/git.git] / Documentation / merge-config.txt

diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 8a0e52f..002ca58 100644 (file)
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -26,11 +26,7 @@ merge.ff::
        allowed (equivalent to giving the `--ff-only` option from the
        command line).
 
-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.
+include::fmt-merge-msg-config.txt[]
 
 merge.renameLimit::
        The number of files to consider when performing rename detection