git.99rst.org Git - git.git/commit

author	Ramkumar Ramachandra <redacted>
	Wed, 8 Sep 2010 17:59:55 +0000 (23:29 +0530)
committer	Junio C Hamano <redacted>
	Thu, 9 Sep 2010 18:39:23 +0000 (11:39 -0700)
commit	bda3b8ff1735aecfb5265ed781548eab238d7a14
tree	726a983b0f5862a9a4974271cae1e609bb1048f9	tree \| snapshot
parent	96e9420cd357728949571b42eb0249881ae3a78e	commit \| diff

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 <redacted>
Thanks-to: Jonathan Nieder <redacted>
Thanks-to: Johannes Sixt <redacted>
Signed-off-by: Junio C Hamano <redacted>

Documentation/git-fmt-merge-msg.txt		diff \| blob \| history
Documentation/merge-config.txt		diff \| blob \| history
builtin/fmt-merge-msg.c		diff \| blob \| history
builtin/merge.c		diff \| blob \| history

RSS Atom

git clone https://git.99rst.org/PROJECT