Merge branch 'jk/unwanted-advices'

* jk/unwanted-advices:
status: make "how to stage" messages optional
push: make non-fast-forward help message configurable

diff --cc Makefile
Simple merge

diff --cc cache.h
Simple merge

diff --cc config.c
Simple merge