merge: Make 'merge.log' an integer or boolean option
authorRamkumar Ramachandra <artagnon@gmail.com>
Wed, 8 Sep 2010 17:59:55 +0000 (23:29 +0530)
committerJunio C Hamano <gitster@pobox.com>
Thu, 9 Sep 2010 18:39:23 +0000 (11:39 -0700)
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>
No differences found