Merge in 1.6.5.4

diff --git a/advice.h b/advice.h
index 862bae37b811b08ccb0fda2449a1c61d5d37f7a1..3de5000d8cb35c1d2c31867b942a54b487bed836 100644 (file)
--- a/advice.h
+++ b/advice.h
@@ -2,6 +2,8 @@
 #define ADVICE_H
 
 extern int advice_push_nonfastforward;
+extern int advice_status_hints;
+extern int advice_commit_before_merge;
 
 int git_default_advice_config(const char *var, const char *value);