X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=advice.c;h=780f58da0f5b508eaa278c98dd15bdf6f919c468;hb=00abd715ab0a2cd69f9d27ea15c5440002f970b8;hp=d2879272802cb3477dd6b47a78098ffdc26dcb37;hpb=801cbd7c71bfc61ebd7dd526ccf43282ef887869;p=git.git

diff --git a/advice.c b/advice.c
index d28792728..780f58da0 100644
--- a/advice.c
+++ b/advice.c
@@ -5,6 +5,8 @@ int advice_push_non_ff_current = 1;
 int advice_push_non_ff_default = 1;
 int advice_push_non_ff_matching = 1;
 int advice_push_already_exists = 1;
+int advice_push_fetch_first = 1;
+int advice_push_needs_force = 1;
 int advice_status_hints = 1;
 int advice_commit_before_merge = 1;
 int advice_resolve_conflict = 1;
@@ -20,6 +22,8 @@ static struct {
 	{ "pushnonffdefault", &advice_push_non_ff_default },
 	{ "pushnonffmatching", &advice_push_non_ff_matching },
 	{ "pushalreadyexists", &advice_push_already_exists },
+	{ "pushfetchfirst", &advice_push_fetch_first },
+	{ "pushneedsforce", &advice_push_needs_force },
 	{ "statushints", &advice_status_hints },
 	{ "commitbeforemerge", &advice_commit_before_merge },
 	{ "resolveconflict", &advice_resolve_conflict },