From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 3 May 2008 20:18:20 +0000 (-0700)
Subject: Merge commit 'sg/merge-options^' into jk/renamelimit
X-Git-Tag: v1.5.6-rc0~60^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec845695c4e6d7b689c3eb0b53d1b2ba4803c7ea;p=thirdparty%2Fgit.git

Merge commit 'sg/merge-options^' into jk/renamelimit

* commit 'sg/merge-options^':
  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
---

ec845695c4e6d7b689c3eb0b53d1b2ba4803c7ea