summaryrefslogtreecommitdiff
path: root/Documentation/technical/api-setup.txt
diff options
context:
space:
mode:
authorLibravatar Ramkumar Ramachandra <artagnon@gmail.com>2010-09-08 23:29:55 +0530
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-09-09 11:39:23 -0700
commitbda3b8ff1735aecfb5265ed781548eab238d7a14 (patch)
tree726a983b0f5862a9a4974271cae1e609bb1048f9 /Documentation/technical/api-setup.txt
parentmerge: Make '--log' an integer option for number of shortlog entries (diff)
downloadtgif-bda3b8ff1735aecfb5265ed781548eab238d7a14.tar.xz
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/technical/api-setup.txt')
0 files changed, 0 insertions, 0 deletions