X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fmerge-config.txt;h=92772e7c4eb8921d3b2763fe1b533c380bd2b92b;hb=b3f01ff29f7131e959bcfdfd004744d74d5fa319;hp=b72f5339704e89087992b7d6060e88f43b9d661b;hpb=5879b6bbcaba7696e4abfa717748da166f915405;p=git.git

diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index b72f53397..92772e7c4 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -7,8 +7,10 @@ merge.conflictstyle::
 	marker and the original text before the `=======` marker.
 
 merge.log::
-	Whether to include summaries of merged commits in newly created
-	merge commit messages. False by default.
+	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 synoym for 20.
 
 merge.renameLimit::
 	The number of files to consider when performing rename detection