push: switch default from "matching" to "simple"

diff --git a/advice.h b/advice.h
index f3cdbbf29e570e151b2b6b329ee9a9940ae59a98..2c800e6787546db9bff62388430a02cc20a40b95 100644 (file)
--- 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;