| commit | bda3b8ff1735aecfb5265ed781548eab238d7a14 | |
| author | Ramkumar Ramachandra <artagnon@gmail.com> | |
| Wed, 8 Sep 2010 17:59:55 +0000 (8 23:29 +0530) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 9 Sep 2010 18:39:23 +0000 (9 11:39 -0700) | ||
| tree | 726a983b0f5862a9a4974271cae1e609bb1048f9 | treesnapshot (tar.gz zip) |
| parent | 96e9420cd357728949571b42eb0249881ae3a78e | commitdiff |
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>
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>
| Documentation/git-fmt-merge-msg.txt | diffblobblamehistory | |
| Documentation/merge-config.txt | diffblobblamehistory | |
| builtin/fmt-merge-msg.c | diffblobblamehistory | |
| builtin/merge.c | diffblobblamehistory |