Merge branch 'jk/unwanted-advices'
commitdc1b0c06ee9b3d2fb086a89e5b12da35bf360e4c
authorJunio C Hamano <gitster@pobox.com>
Sun, 13 Sep 2009 08:33:18 +0000 (13 01:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Sep 2009 08:33:18 +0000 (13 01:33 -0700)
tree4097a3e7f1507c66ef4effc9d2da243c6382a3ed
parent8b54f63dce34c3bbd7ff919fb53c1c253221fe71
parentedf563fbaa2ab50734db4a61e9092f25fbb5a417
Merge branch 'jk/unwanted-advices'

* jk/unwanted-advices:
  status: make "how to stage" messages optional
  push: make non-fast-forward help message configurable
Makefile
cache.h
config.c