Merge branch 'js/rebase-p-tests'

[thirdparty/git.git] / advice.h

diff --git a/advice.h b/advice.h
index 70568fa7922d8aea403e415f9b9b554a88ace293..696bf0e7d29ee107c5faf10a59985c0f49612495 100644 (file)
--- a/advice.h
+++ b/advice.h
@@ -12,15 +12,19 @@ extern int advice_push_needs_force;
 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;
 extern int advice_set_upstream_failure;
 extern int advice_object_name_warning;
+extern int advice_amworkdir;
 extern int advice_rm_hints;
 extern int advice_add_embedded_repo;
 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;
 
 int git_default_advice_config(const char *var, const char *value);
 __attribute__((format (printf, 1, 2)))