Merge branch 'tb/char-may-be-unsigned' into maint

diff --git a/advice.h b/advice.h
index 9f5064e82a862e6daaabe3f23ea9ea896aad87e6..ab24df0fd0d0c739f6f58bb2650bb4162ef4c7f2 100644 (file)
--- a/advice.h
+++ b/advice.h
@@ -17,11 +17,13 @@ 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)))