summaryrefslogtreecommitdiff
path: root/advice.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-05 00:02:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-18 19:36:00 (GMT)
commitb2ed944af79041b4da151a432064c3b1c1b82fc5 (patch)
treec8b44001afc8eff3b318231169613125cea35b85 /advice.h
parentac47a22a7a3c01d38b39c6896a1965ac0b9c473d (diff)
downloadgit-b2ed944af79041b4da151a432064c3b1c1b82fc5.zip
git-b2ed944af79041b4da151a432064c3b1c1b82fc5.tar.gz
git-b2ed944af79041b4da151a432064c3b1c1b82fc5.tar.bz2
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.h')
-rw-r--r--advice.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/advice.h b/advice.h
index f3cdbbf..2c800e6 100644
--- a/advice.h
+++ b/advice.h
@@ -5,7 +5,6 @@
extern int advice_push_nonfastforward;
extern int advice_push_non_ff_current;
-extern int advice_push_non_ff_default;
extern int advice_push_non_ff_matching;
extern int advice_status_hints;
extern int advice_commit_before_merge;