From b2ed944af79041b4da151a432064c3b1c1b82fc5 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 4 Jan 2013 16:02:29 -0800 Subject: push: switch default from "matching" to "simple" We promised to change the behaviour of lazy "git push [there]" that does not say what to push on the command line from "matching" to "simple" in Git 2.0. This finally flips that bit. Helped-by: Matthieu Moy Signed-off-by: Junio C Hamano --- advice.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'advice.c') diff --git a/advice.c b/advice.c index edfbd4a6fb..5afed93670 100644 --- a/advice.c +++ b/advice.c @@ -2,7 +2,6 @@ int advice_push_nonfastforward = 1; int advice_push_non_ff_current = 1; -int advice_push_non_ff_default = 1; int advice_push_non_ff_matching = 1; int advice_status_hints = 1; int advice_commit_before_merge = 1; @@ -16,7 +15,6 @@ static struct { } advice_config[] = { { "pushnonfastforward", &advice_push_nonfastforward }, { "pushnonffcurrent", &advice_push_non_ff_current }, - { "pushnonffdefault", &advice_push_non_ff_default }, { "pushnonffmatching", &advice_push_non_ff_matching }, { "statushints", &advice_status_hints }, { "commitbeforemerge", &advice_commit_before_merge }, -- cgit v1.2.3