diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-04 16:02:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-18 12:36:00 -0700 |
| commit | b2ed944af79041b4da151a432064c3b1c1b82fc5 (patch) | |
| tree | c8b44001afc8eff3b318231169613125cea35b85 /advice.c | |
| parent | ac47a22a7a3c01d38b39c6896a1965ac0b9c473d (diff) | |
| download | git-b2ed944af79041b4da151a432064c3b1c1b82fc5.tar.gz git-b2ed944af79041b4da151a432064c3b1c1b82fc5.tar.xz | |
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 <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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_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 }, |