Merge branch 'rs/discard-index-discard-array' into maint

[git-core/git.git] / advice.h

diff --git a/advice.h b/advice.h
index af0c983..94caa32 100644 (file)
--- a/advice.h
+++ b/advice.h
@@ -16,6 +16,7 @@ extern int advice_commit_before_merge;
 extern int advice_resolve_conflict;
 extern int advice_implicit_identity;
 extern int advice_detached_head;
+extern int advice_set_upstream_failure;
 
 int git_default_advice_config(const char *var, const char *value);
 void advise(const char *advice, ...);