Merge branch 'tg/worktree-add-existing-branch'

diff --git a/advice.h b/advice.h
index f525d6f89cb44dc39188dd06472cf8a59b56f411..9f5064e82a862e6daaabe3f23ea9ea896aad87e6 100644 (file)
--- a/advice.h
+++ b/advice.h
@@ -20,6 +20,8 @@ extern int advice_object_name_warning;
 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;
 
 int git_default_advice_config(const char *var, const char *value);
 __attribute__((format (printf, 1, 2)))