Junio C Hamano ca1c9913f8 Merge branch 'sg/merge-options' (early part) ...

* '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

2008-05-08 20:06:36 -07:00

..

git-completion.bash

Merge branch 'sg/merge-options' (early part)

2008-05-08 20:06:36 -07:00