summaryrefslogtreecommitdiff
path: root/advice.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-03-07 23:13:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-03-07 23:13:15 (GMT)
commit009055f3ecd8d9b4eb140429cb5ce5d2088174c7 (patch)
tree20b94ea336a2cd7435a937b253f9527761e062cb /advice.h
parent6ab4ae2b415c375170309c2b7ace0e4daa8d0215 (diff)
parentb2ed944af79041b4da151a432064c3b1c1b82fc5 (diff)
downloadgit-009055f3ecd8d9b4eb140429cb5ce5d2088174c7.zip
git-009055f3ecd8d9b4eb140429cb5ce5d2088174c7.tar.gz
git-009055f3ecd8d9b4eb140429cb5ce5d2088174c7.tar.bz2
Merge branch 'jc/push-2.0-default-to-simple'
Finally update the "git push" default behaviour to "simple".
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 08fbc8e..5ecc6c1 100644
--- a/advice.h
+++ b/advice.h
@@ -5,7 +5,6 @@
extern int advice_push_update_rejected;
extern int advice_push_non_ff_current;
-extern int advice_push_non_ff_default;
extern int advice_push_non_ff_matching;
extern int advice_push_already_exists;
extern int advice_push_fetch_first;