X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=advice.c;h=cb666acc3cf8fdda777febbefac455f3667759f1;hb=b401a12a2c49d3f3e81e356782d9ca49aaa97faa;hp=b5216a2456f3f1d4e1d0bf582e3a735672217e35;hpb=75194438f412714f4e82ca01e9038dc6714498c4;p=git.git

diff --git a/advice.c b/advice.c
index b5216a245..cb666acc3 100644
--- 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)