summaryrefslogtreecommitdiff
path: root/convert.c
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 /convert.c
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 'convert.c')
0 files changed, 0 insertions, 0 deletions