Merge branch 'jc/maint-limit-note-output' into maint

[git.git] / advice.c

diff --git a/advice.c b/advice.c
index b5216a2456f3f1d4e1d0bf582e3a735672217e35..cb666acc3cf8fdda777febbefac455f3667759f1 100644 (file)
--- a/advice.c
+++ b/advice.c
@@ -1,12 +1,16 @@
 #include "cache.h"
 
 int advice_push_nonfastforward = 1;
+int advice_status_hints = 1;
+int advice_commit_before_merge = 1;
 
 static struct {
        const char *name;
        int *preference;
 } advice_config[] = {
        { "pushnonfastforward", &advice_push_nonfastforward },
+       { "statushints", &advice_status_hints },
+       { "commitbeforemerge", &advice_commit_before_merge },
 };
 
 int git_default_advice_config(const char *var, const char *value)