Merge branch 'js/rebase-recreate-merge'

diff --git a/advice.h b/advice.h
index ab24df0fd0d0c739f6f58bb2650bb4162ef4c7f2..f875f8cd8da5fdb6e570770ecc7ab4461745f827 100644 (file)
--- a/advice.h
+++ b/advice.h
@@ -9,9 +9,11 @@ extern int advice_push_non_ff_matching;
 extern int advice_push_already_exists;
 extern int advice_push_fetch_first;
 extern int advice_push_needs_force;
+extern int advice_push_unqualified_ref_name;
 extern int advice_status_hints;
 extern int advice_status_u_option;
 extern int advice_commit_before_merge;
+extern int advice_reset_quiet_warning;
 extern int advice_resolve_conflict;
 extern int advice_implicit_identity;
 extern int advice_detached_head;