diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-03-07 15:13:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-07 15:13:15 -0800 |
| commit | 009055f3ecd8d9b4eb140429cb5ce5d2088174c7 (patch) | |
| tree | 20b94ea336a2cd7435a937b253f9527761e062cb /advice.c | |
| parent | Merge branch 'maint' (diff) | |
| parent | push: switch default from "matching" to "simple" (diff) | |
| download | tgif-009055f3ecd8d9b4eb140429cb5ce5d2088174c7.tar.xz | |
Merge branch 'jc/push-2.0-default-to-simple'
Finally update the "git push" default behaviour to "simple".
Diffstat (limited to 'advice.c')
| -rw-r--r-- | advice.c | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -2,7 +2,6 @@ int advice_push_update_rejected = 1; 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; @@ -23,7 +22,6 @@ static struct { } advice_config[] = { { "pushupdaterejected", &advice_push_update_rejected }, { "pushnonffcurrent", &advice_push_non_ff_current }, - { "pushnonffdefault", &advice_push_non_ff_default }, { "pushnonffmatching", &advice_push_non_ff_matching }, { "pushalreadyexists", &advice_push_already_exists }, { "pushfetchfirst", &advice_push_fetch_first }, |