Code

merge: Make '--log' an integer option for number of shortlog entries
authorRamkumar Ramachandra <artagnon@gmail.com>
Wed, 8 Sep 2010 17:59:54 +0000 (23:29 +0530)
committerJunio C Hamano <gitster@pobox.com>
Thu, 9 Sep 2010 18:39:20 +0000 (11:39 -0700)
commit96e9420cd357728949571b42eb0249881ae3a78e
tree5dafb2077c1f0354026229cb9df5ee62ce9ccfe8
parent1876166aaab56056083e6a61de4423d130d4dcc6
merge: Make '--log' an integer option for number of shortlog entries

Change the command-line '--log' option from a boolean option to an
integer option, and parse the optional integer provided on the
command-line into the 'shortlog_len' variable. Also update the
documentation accordingly.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Reported-by: Yaroslav Halchenko <debian@onerussian.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
Documentation/merge-options.txt
builtin/fmt-merge-msg.c
builtin/merge.c