Merge branch 'sg/merge-options' (early part)
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 May 2008 03:06:36 +0000 (20:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 May 2008 03:06:36 +0000 (20:06 -0700)
* 'sg/merge-options' (early part):
merge, pull: add '--(no-)log' command line option
fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable
add 'merge.stat' config variable
merge, pull: introduce '--(no-)stat' option
doc: moved merge.* config variables into separate merge-config.txt

No differences found