Merge branch 'jk/unwanted-advices'

* jk/unwanted-advices: status: make "how to stage" messages optional push: make non-fast-forward help message configurable
2009-09-13 01:33:18 -07:00
parent 8b54f63dce edf563fbaa
commit dc1b0c06ee
8 changed files with 66 additions and 1 deletions
--- a/cache.h
+++ b/cache.h
@ -4,6 +4,7 @@
 #include "git-compat-util.h"
 #include "strbuf.h"
 #include "hash.h"
+#include "advice.h"

 #include SHA1_HEADER
 #ifndef git_SHA_CTX