summaryrefslogtreecommitdiff
path: root/Documentation/git-fmt-merge-msg.txt
diff options
context:
space:
mode:
authorRamkumar Ramachandra <artagnon@gmail.com>2010-09-08 17:59:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-09-09 18:39:23 (GMT)
commitbda3b8ff1735aecfb5265ed781548eab238d7a14 (patch)
tree726a983b0f5862a9a4974271cae1e609bb1048f9 /Documentation/git-fmt-merge-msg.txt
parent96e9420cd357728949571b42eb0249881ae3a78e (diff)
downloadgit-bda3b8ff1735aecfb5265ed781548eab238d7a14.zip
git-bda3b8ff1735aecfb5265ed781548eab238d7a14.tar.gz
git-bda3b8ff1735aecfb5265ed781548eab238d7a14.tar.bz2
merge: Make 'merge.log' an integer or boolean option
Make 'merge.log' an integer or boolean option to set the number of shortlog entries to display in the merge commit. Note that it defaults to false, and that true means a default value of 20. Also update corresponding documentation. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Thanks-to: Jonathan Nieder <jrnieder@gmail.com> Thanks-to: Johannes Sixt <j.sixt@viscovery.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-fmt-merge-msg.txt')
-rw-r--r--Documentation/git-fmt-merge-msg.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
index f04a9ff..40dba8c 100644
--- a/Documentation/git-fmt-merge-msg.txt
+++ b/Documentation/git-fmt-merge-msg.txt
@@ -54,8 +54,10 @@ CONFIGURATION
-------------
merge.log::
- Whether to include summaries of merged commits in newly
- 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.summary::
Synonym to `merge.log`; this is deprecated and will be removed in