From bda3b8ff1735aecfb5265ed781548eab238d7a14 Mon Sep 17 00:00:00 2001 From: Ramkumar Ramachandra Date: Wed, 8 Sep 2010 23:29:55 +0530 Subject: 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 Thanks-to: Jonathan Nieder Thanks-to: Johannes Sixt Signed-off-by: Junio C Hamano --- Documentation/merge-config.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Documentation/merge-config.txt') diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index a403155052..acbe1e16b2 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 -- cgit v1.2.3