diff options
| author | Ramkumar Ramachandra <artagnon@gmail.com> | 2010-09-08 23:29:55 +0530 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-09 11:39:23 -0700 |
| commit | bda3b8ff1735aecfb5265ed781548eab238d7a14 (patch) | |
| tree | 726a983b0f5862a9a4974271cae1e609bb1048f9 /Documentation/merge-config.txt | |
| parent | 96e9420cd357728949571b42eb0249881ae3a78e (diff) | |
| download | git-bda3b8ff1735aecfb5265ed781548eab238d7a14.tar.gz | |
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/merge-config.txt')
| -rw-r--r-- | Documentation/merge-config.txt | 6 |
1 files changed, 4 insertions, 2 deletions
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 |