Merge branch 'pw/sequencer-cleanup-with-signoff-x-fix'

diff --git a/advice.h b/advice.h
index ab24df0fd0d0c739f6f58bb2650bb4162ef4c7f2..cb5d36161453dc4c3a8de8e6afd3b3ac28394eaa 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;
@@ -24,6 +26,7 @@ extern int advice_ignored_hook;
 extern int advice_waiting_for_editor;
 extern int advice_graft_file_deprecated;
 extern int advice_checkout_ambiguous_remote_branch_name;
+extern int advice_nested_tag;
 
 int git_default_advice_config(const char *var, const char *value);
 __attribute__((format (printf, 1, 2)))