Merge branch 'jk/unwanted-advices' into next
commit15871c2e7439e64f10c519040a80b98bd912a1a0
authorJunio C Hamano <gitster@pobox.com>
Sat, 12 Sep 2009 05:52:37 +0000 (11 22:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 12 Sep 2009 05:52:37 +0000 (11 22:52 -0700)
treefbdc78214cd5a46cdf8766fc8a0d17c43b49173a
parent9c8bdf3a3462c064793144423039c86afd39efa2
parentedf563fbaa2ab50734db4a61e9092f25fbb5a417
Merge branch 'jk/unwanted-advices' into next

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