summaryrefslogtreecommitdiff
path: root/advice.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-03-07 15:13:15 -0800
committerJunio C Hamano <gitster@pobox.com>2014-03-07 15:13:15 -0800
commit009055f3ecd8d9b4eb140429cb5ce5d2088174c7 (patch)
tree20b94ea336a2cd7435a937b253f9527761e062cb /advice.c
parent6ab4ae2b415c375170309c2b7ace0e4daa8d0215 (diff)
parentb2ed944af79041b4da151a432064c3b1c1b82fc5 (diff)
downloadgit-009055f3ecd8d9b4eb140429cb5ce5d2088174c7.tar.gz
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.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/advice.c b/advice.c
index 3eca9f5ffd..486f823c78 100644
--- a/advice.c
+++ b/advice.c
@@ -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 },